Changeset da6d43a in git for Singular/dyn_modules/freealgebra/freealgebra.cc

Timestamp:

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

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

7f578965e494baafcfc7703025d272601104ccb3

Parents:

e0abce673e2555b4ca67f152983a6c35553826e09dbae2fb591bd8d473909c90f79d3d6074c4834a

Message:

Merge branch 'lpGkDimFix' into stable

File:

• Singular/dyn_modules/freealgebra/freealgebra.cc (modified) (6 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;
   }