Changeset 1c9d98 in git for Singular

Timestamp:

Jan 21, 2020, 1:08:05 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c4ae15496628debfb40fd913b30f80d190ebd49a

Parents:

c3239f94e91d849c92850b63ee75974ac46a405b

Message:

adapt to Singulars history (must set SINGULARHIST)

File:

• Singular/dyn_modules/machinelearning/machinelearning.cc (modified) (2 diffs)

Singular/dyn_modules/machinelearning/machinelearning.cc

@@ -10 +10 @@
 static BOOLEAN predictHelp(leftv result, leftv arg)
 {
-        char *buffer[5];
-        int lengths[5];
-        char filename[15] = "~/.history";
-        int i;
-        lists L = (lists)omAllocBin(slists_bin);
+        char *buffer[5];
+        int lengths[5];
+        char *filename = getenv("SINGULARHIST");
+        if (filename==NULL) filename=(char*)"~/.history";
+        int i;
+        lists L = (lists)omAllocBin(slists_bin);
 
-        buffer[0] = NULL;
-        buffer[1] = NULL;
-        buffer[2] = NULL;
-        buffer[3] = NULL;
-        buffer[4] = NULL;
+        buffer[0] = NULL;
+        buffer[1] = NULL;
+        buffer[2] = NULL;
+        buffer[3] = NULL;
+        buffer[4] = NULL;
 
-        if (write_history(NULL)) {
-                printf("Failed to write history\n");
-                return TRUE;
-        }
+        if (write_history(filename))
+        {
+                printf("Failed to write history\n");
+                return TRUE;
+        }
 
-        if (!ml_initialise()) {
-                Print("Initialise of ml failed.");
-                PrintLn();
-                /* Notify singular that an error occured */
-                return TRUE;
-        }
+        if (!ml_initialise())
+        {
+                WerrorS("Initialise of ml failed.");
+                /* Notify singular that an error occured */
+                return TRUE;
+        }
 
-        ml_make_prediction(filename, buffer, lengths, _omStrDup);
+        ml_make_prediction(filename, buffer, lengths, _omStrDup);
 
-        L->Init(5);
+        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];
-        }
+        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
-        result->rtyp=LIST_CMD;
-        result->data=(void *)L;
+        // pass the resultant list to the res datastructure
+        result->rtyp=LIST_CMD;
+        result->data=(void *)L;
 
-        ml_finalise();
-        return FALSE;
+        ml_finalise();
+        return FALSE;
 
-        //result->rtyp=NONE; // set the result type
+        //result->rtyp=NONE; // set the result type
 }
 
@@ -57 +59 @@
 extern "C" int SI_MOD_INIT(machinelearning)(SModulFunctions* psModulFunctions)
 {
-        // this is the initialization routine of the module
-        // adding the routine predictHelp:
-        psModulFunctions->iiAddCproc(
-                        (currPack->libname? currPack->libname: ""),
-                        "predictHelp",// for the singular interpreter
-                        FALSE, // should enter the global name space
-                        predictHelp); // the C/C++ routine
-        return MAX_TOK;
+        char *filename = getenv("SINGULARHIST");
+        if (filename==NULL)
+        {
+          WarnS("SINGULARHIST is not set - no history available, using ~/.history");
+        }
+        // this is the initialization routine of the module
+        // adding the routine predictHelp:
+        psModulFunctions->iiAddCproc(
+                        (currPack->libname? currPack->libname: ""),
+                        "predictHelp",// for the singular interpreter
+                        FALSE, // should enter the global name space
+                        predictHelp); // the C/C++ routine
+        return MAX_TOK;
 }