Changeset 5de37f3 in git for Singular/iparith.cc

Timestamp:

Dec 14, 2019, 12:12:32 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

fb78239218457e866674d82b8f12307e2a1adde0

Parents:

5aa8ae1cf20f98285f95270931bdd71a62fdc7c1c965dfcfaad2306423cb7b5a94889f0f952cb8b9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-12-14 12:12:32+01:00

git-committer:

GitHub <noreply@github.com>2019-12-14 12:12:32+01:00

Message:

Merge pull request #967 from kabouzeid/lp_lift

lift & liftstd for Letterplace

File:

• Singular/iparith.cc (modified) (6 diffs)

Singular/iparith.cc

@@ -2540 +2540 @@
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < ul)
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", ul);
+      return TRUE;
+    }
+  }
+#endif
   ideal m = idLift((ideal)u->Data(),(ideal)v->Data(),NULL,FALSE,
                    hasFlag(u,FLAG_STD));
@@ -2550 +2560 @@
   if ((v->rtyp!=IDHDL)||(v->e!=NULL)) return TRUE;
   idhdl h=(idhdl)v->data;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < IDELEMS((ideal)u->Data()))
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", IDELEMS((ideal)u->Data()));
+      return TRUE;
+    }
+  }
+#endif
   // CopyD for IDEAL_CMD and MODUL_CMD are identical:
   res->data = (char *)idLiftStd((ideal)u->Data(),
@@ -6539 +6559 @@
   else
   {
+#ifdef HAVE_SHIFTBBA
+    if (rIsLPRing(currRing))
+    {
+      WerrorS("Substituting parameters not implemented for Letterplace rings.");
+      return TRUE;
+    }
+#endif
     res->data=pSubstPar(p,-ringvar,monomexpr);
   }
@@ -6581 +6608 @@
   else
   {
+#ifdef HAVE_SHIFTBBA
+    if (rIsLPRing(currRing))
+    {
+      WerrorS("Substituting parameters not implemented for Letterplace rings.");
+      return TRUE;
+    }
+#endif
     res->data = idSubstPar(id,-ringvar,monomexpr);
   }
@@ -6686 +6720 @@
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < ul)
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", ul);
+      return TRUE;
+    }
+  }
+#endif
   ideal m
     = idLift((ideal)u->Data(),(ideal)v->Data(),NULL,FALSE,hasFlag(u,FLAG_STD),
@@ -6699 +6743 @@
   idhdl hv=(idhdl)v->data;
   idhdl hw=(idhdl)w->data;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < IDELEMS((ideal)u->Data()))
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", IDELEMS((ideal)u->Data()));
+      return TRUE;
+    }
+  }
+#endif
   // CopyD for IDEAL_CMD and MODUL_CMD are identical:
   res->data = (char *)idLiftStd((ideal)u->Data(),