Changeset 092e68 in git

Timestamp:

Aug 8, 2019, 2:33:53 PM (4 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

b03e2f1e6cf3ff16ea956608cf7b560430904959

Parents:

0696a360fd5622a1c1f3cf64fc8282f0ecf1b8bd

Message:

Cleanup c code

Location:

machine_learning

Files:

• mlpredict.h (modified) (1 diff)
• testml.c (modified) (3 diffs)

machine_learning/mlpredict.h

@@ -8 +8 @@
 #ifndef MLPREDICT_H
 #define MLPREDICT_H
-
-#define SINGULAR_BIN    "~/Singular/Singular4/bin/Singular"
-#define EXTRACT_SCRIPT  "extract.lib"
-#define KEYWORDS_FILE   "keywords.txt"
-#define VECTORS_NPY             ".vectors.npy"
-#define HELPFILE_NPY    ".helpfilelist.npy"
-
-#define HELP_FILE_URL   "ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/src/4-1-2/doc.tbz2" 
-#define HELP_FILE_PATH  "helpfiles/singular"
 
 /**

machine_learning/testml.c

@@ -1 +1 @@
 #include <stdio.h>
-#include <Python.h>
+#include <time.h>
 #include "mlpredict.h"
 
@@ -11 +11 @@
         char buffer12[12];
         char buffer20[20];
+        clock_t t;
+        double time_taken;
         if (argc != 1) {
                 printf("Usage: %s\n", argv[0]);
@@ -16 +18 @@
         }
 
+        t = clock();
         i = ml_is_initialised();
+        t = clock() - t;
         printf("Returnvalue for ml_is_initialised: \t%d\n", i);
-        Py_Initialize();
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_initialise();
+        t = clock() - t;
         printf("Returnvalue for ml_initialise: \t\t%d\n", i);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_is_initialised();
+        t = clock() - t;
         printf("Returnvalue for ml_is_initialised: \t%d\n", i);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_make_prediction("test.txt", 10, buffer10, &length);
+        t = clock() - t;
         printf("Returnvalue for ml_make_prediciton: \t%d\n", i);
-        printf("String for buffer size 10: \t%s\n", buffer10);
+        printf("String for buffer size 10: \t\t%s\n", buffer10);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_make_prediction("test.txt", 11, buffer11, &length);
+        t = clock() - t;
         printf("Returnvalue for ml_make_prediciton: \t%d\n", i);
-        printf("String for buffer size 11: \t%s\n", buffer11);
+        printf("String for buffer size 11: \t\t%s\n", buffer11);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_make_prediction("test.txt", 12, buffer12, &length);
+        t = clock() - t;
         printf("Returnvalue for ml_make_prediciton: \t%d\n", i);
-        printf("String for buffer size 12: \t%s\n", buffer12);
+        printf("String for buffer size 12: \t\t%s\n", buffer12);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_make_prediction("test.txt", 20, buffer20, &length);
+        t = clock() - t;
         printf("Returnvalue for ml_make_prediciton: \t%d\n", i);
-        printf("String for buffer size 20: \t%s\n", buffer20);
+        printf("String for buffer size 20: \t\t%s\n", buffer20);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
+        t = clock();
         i = ml_finalise();
+        t = clock() - t;
         printf("Returnvalue for ml_finalise: \t\t%d\n", i);
+        time_taken = ((double)t)/CLOCKS_PER_SEC; /* in seconds */
+        printf("%f seconds\n\n", time_taken);
 
         return 0;