Changeset da6d43a in git for Singular

Timestamp:

Jan 18, 2020, 6:16:51 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7f578965e494baafcfc7703025d272601104ccb3

Parents:

e0abce673e2555b4ca67f152983a6c35553826e09dbae2fb591bd8d473909c90f79d3d6074c4834a

Message:

Merge branch 'lpGkDimFix' into stable

Location:

Singular

Files:

• dyn_modules/freealgebra/freealgebra.cc (modified) (6 diffs)
• extra.cc (modified) (1 diff)
• ipassign.cc (modified) (3 diffs)

Singular/dyn_modules/freealgebra/freealgebra.cc

@@ -136 +136 @@
 static void _computeStandardWords(ideal words, int n, ideal M, int& last)
 {
+  // assume <M> != <1>
   if (n <= 0){
     words->m[0] = pOne();
@@ -144 +145 @@
   _computeStandardWords(words, n - 1, M, last);
 
-  int nVars = currRing->isLPring;
+  int nVars = currRing->isLPring - currRing->LPncGenCount;
 
   for (int j = nVars - 1; j >= 0; j--)
@@ -158 +159 @@
         }
 
-        int varOffset = ((n - 1) * nVars) + 1;
+        int varOffset = ((n - 1) * currRing->isLPring) + 1;
         pSetExp(words->m[index], varOffset + j, 1);
         pSetm(words->m[index]);
@@ -177 +178 @@
 static ideal computeStandardWords(int n, ideal M)
 {
-  int nVars = currRing->isLPring;
+  int nVars = currRing->isLPring - currRing->LPncGenCount;
 
   int maxElems = 1;
@@ -353 +354 @@
       return -2;
     }
+    if (pGetNCGen(_G->m[i]) != 0)
+    {
+      WerrorS("GK-Dim not implemented for bi-modules");
+      return -2;
+    }
   }
 
@@ -377 +383 @@
   {
     int lV = currRing->isLPring;
-    if (IDELEMS(G) == lV) // V = {1} no edges
+    int ncGenCount = currRing->LPncGenCount;
+    if (IDELEMS(G) == lV - ncGenCount) // V = {1} no edges
       return 0;
-    if (IDELEMS(G) == lV - 1) // V = {1} with loop
+    if (IDELEMS(G) == lV - ncGenCount - 1) // V = {1} with loop
       return 1;
-    if (IDELEMS(G) <= lV - 2) // V = {1} with more than one loop
+    if (IDELEMS(G) <= lV - ncGenCount - 2) // V = {1} with more than one loop
       return -1;
   }

Singular/extra.cc

@@ -3845 +3845 @@
     else
 #endif
+/* ====== maEvalAt ============================*/
+    if(strcmp(sys_cmd,"evaluate")==0)
+    {
+      extern number maEvalAt(const poly p,const number* pt, const ring r);
+      if (h->Typ()!=POLY_CMD)
+      {
+        WerrorS("expected system(\"evaluate\",<poly>,..)");
+        return TRUE;
+      }
+      poly p=(poly)h->Data();
+      number *pt=(number*)omAlloc(sizeof(number)*currRing->N);
+      for(int i=0;i<currRing->N;i++)
+      {
+        h=h->next;
+        if ((h==NULL)||(h->Typ()!=NUMBER_CMD))
+        {
+          WerrorS("system(\"evaluate\",<poly>,<number>..) - expect number");
+          return TRUE;
+        }
+        pt[i]=(number)h->Data();
+      }
+      res->data=maEvalAt(p,pt,currRing);
+      res->rtyp=NUMBER_CMD;
+      return FALSE;
+    }
+    else
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

Singular/ipassign.cc

@@ -2054 +2054 @@
       sleftv t;
       matrix olm = (matrix)l->Data();
-      int rk;
+      long rk;
       char *pr=((map)olm)->preimage;
       BOOLEAN module_assign=(/*l->Typ()*/ lt==MODUL_CMD);
       matrix lm ;
-      int  num;
+      long  num;
       int j,k;
       int i=0;
@@ -2108 +2108 @@
             lm->m[i]=(poly)t.CopyD(etyp);
             pNormalize(lm->m[i]);
-            if (module_assign) rk=si_max(rk,(int)pMaxComp(lm->m[i]));
+            if (module_assign) rk=si_max(rk,pMaxComp(lm->m[i]));
             i++;
           }
@@ -2123 +2123 @@
             if (module_assign)
             {
-              j = si_min(num,rm->cols());
-              rk=si_max(rk,(int)rm->rank);
+              j = si_min((int)num,rm->cols());
+              rk=si_max(rk,rm->rank);
             }
             else
-              j = si_min(num-i,rm->rows() * rm->cols());
+              j = si_min(num-i,(long)rm->rows() * (long)rm->cols());
             for(k=0;k<j;k++,i++)
             {