From a43ff1f98e9b9814f858bccb11c174b418458491 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Wed, 10 Oct 2018 21:45:32 -0400 Subject: big rearrangement of files to make libraries and example (research) files clearer, and changed to c++ std lib random numbers --- wolfram_link/Makefile | 13 ------------- wolfram_link/convexminorant.tm | 34 ---------------------------------- 2 files changed, 47 deletions(-) delete mode 100644 wolfram_link/Makefile delete mode 100644 wolfram_link/convexminorant.tm (limited to 'wolfram_link') diff --git a/wolfram_link/Makefile b/wolfram_link/Makefile deleted file mode 100644 index 9d65623..0000000 --- a/wolfram_link/Makefile +++ /dev/null @@ -1,13 +0,0 @@ - -CC = clang -WSPREP = /opt/Mathematica/SystemFiles/Links/WSTP/DeveloperKit/Linux-x86-64/CompilerAdditions/wsprep -CFLAGS = -g -Os -O3 -Wall -fno-strict-aliasing -Wstrict-overflow -Wno-missing-field-initializers -flto -fopenmp=libiomp5 -I/usr/lib/gcc/x86_64-linux-gnu/4.8/include/ -march=native -I/opt/Mathematica/SystemFiles/Links/WSTP/DeveloperKit/Linux-x86-64/CompilerAdditions/ -I../lib/ -LDFLAGS = -L/opt/Mathematica/SystemFiles/Links/WSTP/DeveloperKit/Linux-x86-64/CompilerAdditions -lm -lpthread -lrt -lstdc++ -ldl -luuid -l WSTP64i4 - -convex.o: ../lib/convex.c - @${CC} -c -o $@ $< ${CFLAGS} - -convexminorant: convexminorant.tm convex.o - @${WSPREP} $< -o $@.c - @${CC} -o $@ convex.o $@.c ${CFLAGS} ${LDFLAGS} - diff --git a/wolfram_link/convexminorant.tm b/wolfram_link/convexminorant.tm deleted file mode 100644 index edca6f4..0000000 --- a/wolfram_link/convexminorant.tm +++ /dev/null @@ -1,34 +0,0 @@ - -#include -#include - -extern int WSMain(int, char **); - -void convexminorant(double *, int); - -:Begin: -:Function: convexminorant -:Pattern: GetConvexMinorant[ list:{___Real} ] -:Arguments: { list } -:ArgumentTypes: { Real64List } -:ReturnType: Manual -:End: - -:Evaluate: GetConvexMinorant[ sequence___Float]:= GetConvexMinorant[ {sequence} ] - -void convexminorant(double * Gammas, int len) { - int i; - for (i = 0; i < len; i++) { - if (Gammas[i] <= 0) { - break; - } - } - double *m = get_convex_minorant(i, Gammas); - WSPutReal64List(stdlink, m, i); - free(m); -} - -int main(int argc, char **argv) { - return WSMain(argc, argv); -} - -- cgit v1.2.3-70-g09d2