Changeset 9d58a7c in git

Timestamp:

Apr 27, 2020, 3:59:47 PM (3 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

124970a039a4d92a4058c3b8384095b596b6d733

Parents:

e1ef7b116283b782bdf06753542a2e15e181852b

Message:

Working modulo for LP

Files:

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

Singular/table.h

@@ -699 +699 @@
 ,{D(jjLOAD_E),    LOAD_CMD,       NONE,           STRING_CMD, STRING_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjRES),       LRES_CMD,       RESOLUTION_CMD, IDEAL_CMD,  INT_CMD, NO_NC |NO_RING}
-,{D(jjMODULO),    MODULO_CMD,     MODUL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
-,{D(jjMODULO),    MODULO_CMD,     MODUL_CMD,      MODUL_CMD,  MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjMODULO),    MODULO_CMD,     MODUL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_NC |ALLOW_RING}
+,{D(jjMODULO),    MODULO_CMD,     MODUL_CMD,      MODUL_CMD,  MODUL_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjMONITOR2),  MONITOR_CMD,    NONE,           LINK_CMD, STRING_CMD, ALLOW_NC |ALLOW_RING}
 //,{D(jjRES),       MRES_CMD,       LIST_CMD,       IDEAL_CMD,  INT_CMD, NO_NC |ALLOW_RING}

kernel/ideals.cc

@@ -2327 +2327 @@
     temp->m[i] = pCopy(h2->m[i]);
     q = pOne();
+#ifdef HAVE_SHIFTBBA
+    // non multiplicative variable
+    if (rIsLPRing(currRing))
+    {
+      pSetExp(q, currRing->isLPring - currRing->LPncGenCount + i + 1, 1);
+      p_Setm(q, currRing);
+    }
+#endif
     pSetComp(q,i+1+length);
     pSetmComp(q);
@@ -2333 +2341 @@
       if (slength==0) p_Shift(&(temp->m[i]),1,currRing);
       p = temp->m[i];
-      while (pNext(p)!=NULL) pIter(p);
-      pNext(p) = q; // will be sorted later correctly
+#ifdef HAVE_SHIFTBBA
+      if (rIsLPRing(currRing))
+      {
+        temp->m[i] = pAdd(p, q);
+      }
+      else
+#endif
+      {
+        while (pNext(p)!=NULL) pIter(p);
+        pNext(p) = q; // will be sorted later correctly
+      }
     }
     else