Changeset bcef5c in git

Timestamp:

Sep 16, 2019, 1:05:01 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

50fb15949d9519d601bdaaa9bf8bbb49921c95a7

Parents:

f0dcd61d6b40b59408860cf1bdbc88f0d558a871

Message:

Put list of predictions in Singular list

Files:

• Singular/iparith.cc (modified) (2 diffs)
• machine_learning/mlpredict.c (modified) (3 diffs)
• machine_learning/mlpredict.h (modified) (1 diff)
• machine_learning/tests/test_bufsize.c (modified) (1 diff)
• machine_learning/tests/test_init_ml.c (modified) (1 diff)

Singular/iparith.cc

@@ -7802 +7802 @@
 static BOOLEAN jjPREDHELP0(leftv res, leftv)
 {
-        char buffer[30];
+        char *buffer[5];
+        int lengths[5];
         char filename[15] = "~/.history";
         int i;
         lists L = (lists)omAllocBin(slists_bin);
 
-        buffer[0] = '\0';
+        buffer[0] = NULL;
+        buffer[1] = NULL;
+        buffer[2] = NULL;
+        buffer[3] = NULL;
+        buffer[4] = NULL;
 
         if(write_history(NULL)) {
@@ -7821 +7826 @@
         }
 
-        ml_make_prediction(filename, 30, buffer, &i);
-        printf("prediction %s\n", buffer);
-
-        L->Init(1);
-
-        L->m[0].rtyp = STRING_CMD;
-        L->m[0].data = omStrDup("SomeString");
+        ml_make_prediction(filename, buffer, lengths, _omStrDup);
+
+        L->Init(5);
+
+        for (i = 0; i < 5; i++) {
+                //printf("prediction %d: %s\n", i, buffer[i]);
+                L->m[i].rtyp = STRING_CMD;
+                L->m[i].data = buffer[i];
+        }
 
         // pass the resultant list to the res datastructure

machine_learning/mlpredict.c

@@ -212 +212 @@
 int ml_make_prediction(char *filename,
                        char *prediction_buffers[],
-                       int *pred_len)
+                       int *pred_len,
+                       char *(*custom_strdup)(const char *))
 {
         PyObject *pFName = NULL;
@@ -261 +262 @@
         if (PyList_Size(pValue) != 5) {
                 printf("List length is supposed to be five, but is %d.\n",
-                                PyList_Size(pValue));
+                                (int)PyList_Size(pValue));
                 Py_DECREF(pValue);
                 return 0;
@@ -268 +269 @@
         for (i = 0; i < 5; i++) {
                 pString = PyObject_Str(PyList_GetItem(pValue, i));
-                prediction_buffers[i] = strdup(PyString_AsString(pString));
+                prediction_buffers[i] = custom_strdup(PyString_AsString(pString));
                 //pTemp = PyUnicode_AsASCIIString(pString);
-                //prediction_buffers[i] = strdup(PyBytes_AsString(pTemp));
+                //prediction_buffers[i] = custom_strdup(PyBytes_AsString(pTemp));
                 pred_len[i] = strlen(prediction_buffers[i]);
                 Py_DECREF(pString);

machine_learning/mlpredict.h

@@ -61 +61 @@
 int ml_make_prediction(char *filename,
                        char *prediction_buffers[],
-                       int *pred_len);
+                       int *pred_len,
+                       char *(*custom_strdup)(const char *));
 
 #ifdef __cplusplus

machine_learning/tests/test_bufsize.c

@@ -21 +21 @@
         if (i != 0)                             return 1;
 
-        i = ml_make_prediction("test.txt", buffer, length);
+        i = ml_make_prediction("test.txt", buffer, length, strdup);
         printf("Returnvalue for ml_make_prediciton: \t%d\n", i);
         for (k = 0; k < 5; k++) {

machine_learning/tests/test_init_ml.c

@@ -135 +135 @@
 
         i = ml_finalise();
-        printf("Returnvalue for ml_finalise: \t%d\n", i);
+        printf("Returnvalue for ml_finalise: \t\t%d\n", i);
         if (i != 1)     return 1;