Changeset 87d423 in git

Timestamp:

Aug 23, 2019, 10:13:24 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1594757a62a2f1f847b4aebcfacdc8a03885abf9

Parents:

cd552eb18a483f4541fb1abe06b65fd12e5852c0

git-author:

Murray Heymann <heymann.murray@gmail.com>2019-08-23 22:13:24+02:00

git-committer:

Murray Heymann <heymann.murray@gmail.com>2019-08-23 22:13:32+02:00

Message:

Start creating built-in function for predict fx

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Singular/table.h (modified) (3 diffs)
• Singular/tok.h (modified) (1 diff)
• machine_learning/ml_python/common/lookuptable.py (modified) (1 diff)
• machine_learning/mlpredict.c (modified) (1 diff)

Singular/iparith.cc

@@ -7796 +7796 @@
   return setOption(res,v);
 }
+
+
+//HERE
+static BOOLEAN jjPREDHELP0(leftv res, leftv)
+{
+        lists L = (lists)omAllocBin(slists_bin);
+        if (!ml_initialise()) {
+                Print("Not as advertised.");
+                PrintLn();
+        }
+
+        L->Init(1);
+
+        L->m[0].rtyp = STRING_CMD;
+        L->m[0].data = omStrDup("SomeString");
+
+        // pass the resultant list to the res datastructure
+        res->data=(void *)L;
+
+        ml_finalise();
+        return FALSE;
+}
+
+
+
 static BOOLEAN jjREDUCE4(leftv res, leftv u)
 {
@@ -8002 +8027 @@
                 }
         }
-        // free the struct (not the list itself)
+        // free the struct (not the list entries itself, which were allocated
+        // by strdup)
+        omfree(bb_list->list);
         omfree(bb_list);
 

Singular/table.h

@@ -948 +948 @@
 ,{D(jjCALL2ARG),  CNUMBER_CMD,     CNUMBER_CMD,         2      , ALLOW_NC |ALLOW_RING}
 ,{D(jjOPTION_PL), OPTION_CMD,      STRING_CMD/*or set by p*/,-1, ALLOW_NC |ALLOW_RING}
+,{D(jjPREDHELP0), PREDHELP_CMD,    LIST_CMD,            0      , ALLOW_NC |ALLOW_RING}
 ,{D(jjCALL2ARG),  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  2, ALLOW_NC |ALLOW_RING}
 ,{D(jjCALL3ARG),  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  3, ALLOW_NC |ALLOW_RING}
@@ -954 +955 @@
 ,{D(jjCALL1ARG),  RESERVEDNAME_CMD, INT_CMD,            1      , ALLOW_NC |ALLOW_RING}
 ,{D(jjRESERVED0), RESERVEDNAME_CMD, NONE,               0      , ALLOW_NC |ALLOW_RING}
-//,{D(jjCALL1ARG),  RESERVEDNAMELIST_CMD, LIST_CMD,            1      , ALLOW_NC |ALLOW_RING}
-,{D(jjRESERVEDLIST0), RESERVEDNAMELIST_CMD, LIST_CMD,               0      , ALLOW_NC |ALLOW_RING}
+//,{D(jjCALL1ARG),  RESERVEDNAMELIST_CMD, LIST_CMD,       1      , ALLOW_NC |ALLOW_RING}
+,{D(jjRESERVEDLIST0), RESERVEDNAMELIST_CMD, LIST_CMD,   0      , ALLOW_NC |ALLOW_RING}
 ,{D(jjSTRING_PL), STRING_CMD,      STRING_CMD,         -1      , ALLOW_NC |ALLOW_RING}
 ,{D(jjCALL3ARG),  SUBST_CMD,       NONE/*set by p*/,   3       , ALLOW_PLURAL |ALLOW_RING}
@@ -1156 +1157 @@
   { "poly",        0, POLY_CMD ,          RING_DECL},
   { "polyBucket",  0, BUCKET_CMD ,        RING_DECL},
+  { "predictHelp", 0, PREDHELP_CMD ,      CMD_M},
   { "preimage",    0, PREIMAGE_CMD ,      CMD_13},
   { "prime",       0, PRIME_CMD ,         CMD_1},

Singular/tok.h

@@ -152 +152 @@
   PARSTR_CMD,
   PFAC_CMD,
+  PREDHELP_CMD,
   PRIME_CMD,
   PRINT_CMD,

machine_learning/ml_python/common/lookuptable.py

@@ -76 +76 @@
             not os.path.isfile(HELPFILE_NPY) or \
             not attempt_cached:
-        os.makedirs(HOME_DIR, exist_ok=True)
+        if not os.path.exists(HOME_DIR):
+            os.makedirs(HOME_DIR)
         file_list = np.array(get_list_of_htm_files())
         np.save(HELPFILE_NPY, file_list)

machine_learning/mlpredict.c

@@ -100 +100 @@
         } else {
                 retvalue = 0;
+                printf("HERE!!!!\n");
         }