Changeset bf7809 in git

Timestamp:

Jun 22, 2017, 10:19:12 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a9ed33afe407efe033af4b9329d3e00fefd17a35

Parents:

991aba29b3b88762eeea5ba2c4f5e0f8a9319985

Message:

fix: rootisolationi.lib and interval.so

format, error mesages simplified, more staic routines

Location:

Singular

Files:

• LIB/rootisolation.lib (modified) (1 diff)
• dyn_modules/interval/interval.cc (modified) (52 diffs)
• dyn_modules/interval/interval.h (modified) (1 diff)

Singular/LIB/rootisolation.lib

@@ -52 +52 @@
 static proc mod_init()
 {
-    //LIB "interval.so"; // use this if integrated into Singular Sources
-    LIB "dyn_modules/interval.so";
+    LIB "interval.so"; // use this if integrated into Singular Sources
+    //LIB "dyn_modules/interval.so";
     LIB "atkins.lib"; // for round (tmp?)
 

Singular/dyn_modules/interval/interval.cc

@@ -108 +108 @@
  */
 
-int intervalID;
-int boxID;
+static int intervalID;
+static int boxID;
 
 /*
@@ -115 +115 @@
  */
 
-void* interval_Init(blackbox*)
+static void* interval_Init(blackbox*)
 {
     return (void*) new interval();
@@ -121 +121 @@
 
 // convert interval to string
-char* interval_String(blackbox*, void *d)
+static char* interval_String(blackbox*, void *d)
 {
     if (d == NULL)
@@ -143 +143 @@
 }
 
-void* interval_Copy(blackbox*, void *d)
+static void* interval_Copy(blackbox*, void *d)
 {
     return (void*) new interval((interval*) d);
@@ -149 +149 @@
 
 // destroy interval
-void interval_Destroy(blackbox*, void *d)
+static void interval_Destroy(blackbox*, void *d)
 {
     if (d != NULL)
@@ -156 +156 @@
 
 // assigning values to intervals
-BOOLEAN interval_Assign(leftv result, leftv args)
+static BOOLEAN interval_Assign(leftv result, leftv args)
 {
     assume(result->Typ() == intervalID);
@@ -187 +187 @@
     else
     {
-        Werror("Input not supported: first argument not int or number");
+        WerrorS("Input not supported: first argument not int or number");
         return TRUE;
     }
@@ -212 +212 @@
         else
         {
-            Werror("Input not supported: second argument not int or number");
+            WerrorS("Input not supported: second argument not int or number");
             return TRUE;
         }
@@ -239 +239 @@
 }
 
-BOOLEAN length(leftv result, leftv arg)
+static BOOLEAN length(leftv result, leftv arg)
 {
     if (arg != NULL && arg->Typ() == intervalID)
@@ -250 +250 @@
     }
 
-    Werror("syntax: length(<interval>)");
+    WerrorS("syntax: length(<interval>)");
     return TRUE;
 }
@@ -256 +256 @@
 // interval -> interval procedures
 
-interval* intervalScalarMultiply(number a, interval *I)
+static interval* intervalScalarMultiply(number a, interval *I)
 {
     number lo, up;
@@ -276 +276 @@
 }
 
-interval* intervalMultiply(interval *I, interval *J)
+static interval* intervalMultiply(interval *I, interval *J)
 {
     number lo, up;
@@ -313 +313 @@
 }
 
-interval* intervalAdd(interval *I, interval *J)
+static interval* intervalAdd(interval *I, interval *J)
 {
     number lo = nAdd(I->lower, J->lower),
@@ -324 +324 @@
 }
 
-interval* intervalSubtract(interval *I, interval *J)
+static interval* intervalSubtract(interval *I, interval *J)
 {
     number lo = nSub(I->lower, J->upper),
@@ -335 +335 @@
 }
 
-bool intervalEqual(interval *I, interval *J)
+static bool intervalEqual(interval *I, interval *J)
 {
     return nEqual(I->lower, J->lower) && nEqual(I->upper, J->upper);
@@ -341 +341 @@
 
 // ckeck if zero is contained in an interval
-bool intervalContainsZero(interval *I)
+static bool intervalContainsZero(interval *I)
 {
     number n = nMult(I->lower, I->upper);
@@ -351 +351 @@
 }
 
-interval* intervalPower(interval *I, int p)
+static interval* intervalPower(interval *I, int p)
 {
     if (p == 0)
@@ -411 +411 @@
  */
 
-BOOLEAN interval_Op2(int op, leftv result, leftv i1, leftv i2)
+static BOOLEAN interval_Op2(int op, leftv result, leftv i1, leftv i2)
 {
     interval *RES;
@@ -421 +421 @@
             if (i1->Typ() != intervalID || i2->Typ() != intervalID)
             {
-                Werror("syntax: <interval> + <interval>");
+                WerrorS("syntax: <interval> + <interval>");
                 return TRUE;
             }
@@ -435 +435 @@
             if (i1->Typ() != intervalID || i2->Typ() != intervalID)
             {
-                Werror("syntax: <interval> - <interval>");
+                WerrorS("syntax: <interval> - <interval>");
                 return TRUE;
             }
@@ -482 +482 @@
                         { n = (number) iscalar->CopyD(); break; }
                     default:
-                        { Werror("first argument not int/number/interval"); return TRUE; }
+                        { WerrorS("first argument not int/number/interval"); return TRUE; }
                 }
 
@@ -504 +504 @@
                 if(intervalContainsZero(I2))
                 {
-                    Werror("second interval contains zero");
+                    WerrorS("second interval contains zero");
                     return TRUE;
                 }
@@ -538 +538 @@
                         default:
                         {
-                            Werror("first argument not int/number/interval");
+                            WerrorS("first argument not int/number/interval");
                             delete I2inv;
                             return TRUE;
@@ -563 +563 @@
                     default:
                     {
-                        Werror("second argument not int/number/interval");
+                        WerrorS("second argument not int/number/interval");
                         return TRUE;
                     }
@@ -570 +570 @@
                 if (nIsZero(n))
                 {
-                    Werror("<interval>/0 not supported");
+                    WerrorS("<interval>/0 not supported");
                     return TRUE;
                 }
@@ -588 +588 @@
             if (i1->Typ() != intervalID || i2->Typ() != INT_CMD)
             {
-                Werror("syntax: <interval> ^ <int>");
+                WerrorS("syntax: <interval> ^ <int>");
                 return TRUE;
             }
@@ -594 +594 @@
             if (p < 0)
             {
-                Werror("<interval> ^ n not implemented for n < 0");
+                WerrorS("<interval> ^ n not implemented for n < 0");
                 return TRUE;
             }
@@ -606 +606 @@
             if (i1->Typ() != intervalID || i2->Typ() != intervalID)
             {
-                Werror("syntax: <interval> == <interval>");
+                WerrorS("syntax: <interval> == <interval>");
                 return TRUE;
             }
@@ -623 +623 @@
             if (i1->Typ() != intervalID || i2->Typ() != INT_CMD)
             {
-                Werror("syntax: <interval>[<int>]");
+                WerrorS("syntax: <interval>[<int>]");
                 return TRUE;
             }
@@ -641 +641 @@
             else
             {
-                Werror("Allowed indices are 1 and 2");
+                WerrorS("Allowed indices are 1 and 2");
                 return TRUE;
             }
@@ -678 +678 @@
 }
 
-BOOLEAN interval_serialize(blackbox*, void *d, si_link f)
+static BOOLEAN interval_serialize(blackbox*, void *d, si_link f)
 {
     /*
@@ -714 +714 @@
 }
 
-BOOLEAN interval_deserialize(blackbox**, void **d, si_link f)
+static BOOLEAN interval_deserialize(blackbox**, void **d, si_link f)
 {
     leftv l;
@@ -734 +734 @@
  */
 
-void* box_Init(blackbox*)
+static void* box_Init(blackbox*)
 {
     return (void*) new box();
 }
 
-void* box_Copy(blackbox*, void *d)
+static void* box_Copy(blackbox*, void *d)
 {
     return (void*) new box((box*) d);
 }
 
-void box_Destroy(blackbox*, void *d)
+static void box_Destroy(blackbox*, void *d)
 {
     if (d != NULL)
@@ -750 +750 @@
 }
 
-char* box_String(blackbox*, void *d)
+static char* box_String(blackbox*, void *d)
 {
     blackbox *b_i = getBlackboxStuff(intervalID);
@@ -773 +773 @@
 
 // assigning values to intervals
-BOOLEAN box_Assign(leftv result, leftv args)
+static BOOLEAN box_Assign(leftv result, leftv args)
 {
     assume(result->Typ() == boxID);
@@ -805 +805 @@
             if (l->m[i].Typ() != intervalID)
             {
-                Werror("list contains non-intervals");
+                WerrorS("list contains non-intervals");
                 delete RES;
                 args->CleanUp();
@@ -818 +818 @@
                 if (RES->R->cf != RES->intervals[i]->R->cf)
                 {
-                    Werror("Passing interval to ring with different coefficient field");
+                    WerrorS("Passing interval to ring with different coefficient field");
                     delete RES;
                     args->CleanUp();
@@ -832 +832 @@
     else
     {
-        Werror("Input not supported: first argument not box, list, or interval");
+        WerrorS("Input not supported: first argument not box, list, or interval");
         return TRUE;
     }
@@ -856 +856 @@
 }
 
-BOOLEAN box_Op2(int op, leftv result, leftv b1, leftv b2)
+static BOOLEAN box_Op2(int op, leftv result, leftv b1, leftv b2)
 {
     if (b1 == NULL || b1->Typ() != boxID)
@@ -875 +875 @@
             if (b2 == NULL || b2->Typ() != INT_CMD)
             {
-                Werror("second argument not int");
+                WerrorS("second argument not int");
                 return TRUE;
             }
@@ -887 +887 @@
             if (i < 1 || i > n)
             {
-                Werror("index out of bounds");
+                WerrorS("index out of bounds");
                 return TRUE;
             }
@@ -907 +907 @@
             if (b2 == NULL || b2->Typ() != boxID)
             {
-                Werror("second argument not box");
+                WerrorS("second argument not box");
             }
             if (result->Data() != NULL)
@@ -939 +939 @@
             if (b2 == NULL || b2->Typ() != boxID)
             {
-                Werror("second argument not box");
+                WerrorS("second argument not box");
             }
             box *B2 = (box*) b2->Data();
@@ -964 +964 @@
 }
 
-BOOLEAN box_OpM(int op, leftv result, leftv args)
+static BOOLEAN box_OpM(int op, leftv result, leftv args)
 {
     leftv a = args;
@@ -973 +973 @@
             if (args->Typ() != boxID)
             {
-                Werror("can only intersect boxes");
+                WerrorS("can only intersect boxes");
                 return TRUE;
             }
@@ -992 +992 @@
                 if (args->Typ() != boxID)
                 {
-                    Werror("can only intersect boxes");
+                    WerrorS("can only intersect boxes");
                     return TRUE;
                 }
@@ -1036 +1036 @@
 }
 
-BOOLEAN box_serialize(blackbox*, void *d, si_link f)
+static BOOLEAN box_serialize(blackbox*, void *d, si_link f)
 {
     /*
@@ -1067 +1067 @@
 }
 
-BOOLEAN box_deserialize(blackbox**, void **d, si_link f)
+static BOOLEAN box_deserialize(blackbox**, void **d, si_link f)
 {
     leftv l;
@@ -1092 +1092 @@
 }
 
-BOOLEAN boxSet(leftv result, leftv args)
+static BOOLEAN boxSet(leftv result, leftv args)
 {
     assume(result->Typ() == boxID);
@@ -1109 +1109 @@
     if (i < 1 || i > n)
     {
-        Werror("index out of range");
+        WerrorS("index out of range");
         return TRUE;
     }
@@ -1122 +1122 @@
         if (RES->R->cf != RES->intervals[i-1]->R->cf)
         {
-            Werror("Passing interval to ring with different coefficient field");
+            WerrorS("Passing interval to ring with different coefficient field");
             delete RES;
             args->CleanUp();
@@ -1143 +1143 @@
  */
 
-BOOLEAN evalPolyAtBox(leftv result, leftv args)
+static BOOLEAN evalPolyAtBox(leftv result, leftv args)
 {
     assume(result->Typ() == intervalID);

Singular/dyn_modules/interval/interval.h

@@ -29 +29 @@
 };
 
-extern int intervalID;
-extern int boxID;
+//extern int intervalID;
+//extern int boxID;
 
 // helpful functions
-interval* intervalScalarMultiply(number, interval*);
-interval* intervalMultiply(interval*, interval*);
-interval* intervalAdd(interval*, interval*);
-interval* intervalSubtract(interval*, interval*);
-bool intervalEqual(interval*, interval*);
-bool intervalContainsZero(interval*);
+//interval* intervalScalarMultiply(number, interval*);
+//interval* intervalMultiply(interval*, interval*);
+//interval* intervalAdd(interval*, interval*);
+//interval* intervalSubtract(interval*, interval*);
+//bool intervalEqual(interval*, interval*);
+//bool intervalContainsZero(interval*);
 
 extern "C" int mod_init(SModulFunctions*);