Changeset 4d56fe in git for Singular/dyn_modules/singmathic/singmathic.cc

Timestamp:

Mar 24, 2015, 5:08:27 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

9b240710d9ea423c1b2f46292d3623feeb39a4b3

Parents:

a94825bccfd22b15bed688d4960beff0c826c021853606b08213635f36b832787aa660894c0a3cce

Message:

Merge pull request #709 from YueRen/annoyingStdWarning

chg: ommit calling assumeStdFlag if ideal or module is principal and current ring is quotient free

File:

• Singular/dyn_modules/singmathic/singmathic.cc (modified) (3 diffs)

Singular/dyn_modules/singmathic/singmathic.cc

@@ -464 +464 @@
 }
 
-BOOLEAN setRingGlobal(leftv result, leftv arg) {
-  currRing->OrdSgn = 1;
-  result->rtyp=NONE;
-  return FALSE;
-}
-
 BOOLEAN mathicgb(leftv result, leftv arg)
 {
   result->rtyp=NONE;
 
-  if (arg == NULL || arg->next != NULL || arg->Typ() != IDEAL_CMD) {
-    WerrorS("Syntax: mathicgb(<ideal>)");
+  if (arg == NULL || arg->next != NULL || 
+  ((arg->Typ() != IDEAL_CMD) &&(arg->Typ() != MODUL_CMD))){
+    WerrorS("Syntax: mathicgb(<ideal>/<module>)");
     return TRUE;
   }
@@ -518 +513 @@
   mgb::computeGroebnerBasis(toMathic, fromMathic);
 
-  result->rtyp=IDEAL_CMD;
+  result->rtyp = arg->Typ();
   result->data = fromMathic.takeIdeal();
   return FALSE;
@@ -542 +537 @@
     prOrderX
   );
-  psModulFunctions->iiAddCproc(
-    (currPack->libname ? currPack->libname : ""),
-    "mathicgb_setRingGlobal",
-    FALSE,
-    setRingGlobal
-  );
   return MAX_TOK;
 }