Changeset 7356be in git

Timestamp:

Aug 20, 2014, 2:19:22 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

705ba5c5ec2a3bd98f128ce3753d41613b1eebc7

Parents:

85e86930dc779f09984e6c7072e7e5818ec04930

Message:

simplified system: removed minor, waitforssilinks, naIdeal

Files:

• Singular/extra.cc (modified) (3 diffs)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (1 diff)

Singular/extra.cc

@@ -949 +949 @@
         return FALSE;
       }
-  /*==================== forking experiments ======================*/
-      if(strcmp(sys_cmd, "waitforssilinks")==0)
-      {
-        if ((h != NULL) && (h->Typ() == LIST_CMD) &&
-            (h->next != NULL) && (h->next->Typ() == INT_CMD))
-        {
-          lists L = (lists)h->Data();
-          int timeMillisec = (int)(long)h->next->Data();
-          int n = slStatusSsiL(L, timeMillisec * 1000);
-          res->rtyp = INT_CMD;
-          res->data = (void*)(long)n;
-          return FALSE;
-        }
-        else
-        {
-          Werror( "expected list of open ssi links and timeout");
-          return TRUE;
-        }
-      }
+      else
   /*==================== neworder =============================*/
   // should go below
@@ -2669 +2651 @@
       else
 #endif
-  /*==================== naIdeal ==================================*/
-//       // This seems to be obsolette with the new Frank's alg.ext field...
-//       if(strcmp(sys_cmd,"naIdeal")==0)
-//       {
-//         if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
-//         {
-//           naSetIdeal((ideal)h->Data());
-//           return FALSE;
-//         }
-//         else
-//            WerrorS("ideal expected");
-//       }
-//       else
   /*==================== pDivStat =============================*/
   #if defined(PDEBUG) || defined(PDIV_DEBUG)
@@ -3154 +3123 @@
          return FALSE;
        }
-  /*==================== minor =================*/
-      if (strcmp(sys_cmd, "minor")==0)
-      {
-        matrix a = (matrix) h->Data();
-        h = h->next;
-        int ar = (int)(long) h->Data();
-        h = h->next;
-        int which = (int)(long) h->Data();
-        h = h->next;
-        ideal R = NULL;
-        if (h != NULL)
-        {
-          R = (ideal) h->Data();
-        }
-        res->data=(poly) idMinor(a, ar, (unsigned long) which, R);
-        if (res->data == (poly) 1)
-        {
-          res->rtyp=INT_CMD;
-          res->data = 0;
-        }
-        else
-        {
-          res->rtyp=POLY_CMD;
-        }
-        return(FALSE);
-      }
       else
   /*==================== F5 Implementation =================*/

kernel/ideals.cc

@@ -1651 +1651 @@
 }
 
+#ifdef WITH_OLD_MINOR
 /*2
 * compute the which-th ar-minor of the matrix a
@@ -1718 +1719 @@
 }
 
-#ifdef WITH_OLD_MINOR
 /*2
 * compute all ar-minors of the matrix a

kernel/ideals.h

@@ -158 +158 @@
 ideal   idElimination (ideal h1,poly delVar, intvec *hilb=NULL);
 
+#ifdef WITH_OLD_MINOR
 poly idMinor(matrix a, int ar, unsigned long which, ideal R = NULL);
+#endif
 ideal   idMinors(matrix a, int ar, ideal R = NULL);