Changeset f907fc in git

Timestamp:

Nov 24, 1999, 3:07:23 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

32d5d47cd333de31bc974794d8f7c310be0f5851

Parents:

d88eb6580cce37f42c7a29bce0b292e3b119a563

Message:

* fixed prun/idMinEmbedding


git-svn-id: file:///usr/local/Singular/svn/trunk@3913 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ideals.cc (modified) (2 diffs)
• iparith.cc (modified) (7 diffs)
• polys-impl.cc (modified) (2 diffs)
• syz.cc (modified) (2 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.77 1999-11-23 17:09:20 hannes Exp $ */
+/* $Id: ideals.cc,v 1.78 1999-11-24 14:07:21 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1883 +1883 @@
     s_h4 = idrMoveR_NoSort(s_h4,orig_ring);
 
+  idTest(s_h4);
   ideal s_h3;
   if (addOnlyOne)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.188 1999-11-24 14:02:17 wichmann Exp $ */
+/* $Id: iparith.cc,v 1.189 1999-11-24 14:07:22 obachman Exp $ */
 
 /*
@@ -2952 +2952 @@
   return FALSE;
 }
+static BOOLEAN jjPRUNE(leftv res, leftv v)
+{
+  res->data = (char *)idMinEmbedding((ideal)v->Data());
+  return FALSE;
+}
 static BOOLEAN jjP2N(leftv res, leftv v)
 {
@@ -3194 +3199 @@
 #define jjrVarStr      (proc1)18
 #define jjrParStr      (proc1)19
-#define jjidMinEmbedding (proc1)20
 #define jjCOUNT_R        (proc1)22
 #define jjDIM_R          (proc1)23
@@ -3232 +3236 @@
         case (int)jjrVarStr:      dArith1[i].p=(proc1)rVarStr; break;
         case (int)jjrParStr:      dArith1[i].p=(proc1)rParStr; break;
-        case (int)jjidMinEmbedding: dArith1[i].p=(proc1)idMinEmbedding; break;
         case (int)jjCOUNT_R:      dArith1[i].p=(proc1)syLength; break;
         case (int)jjDIM_R:        dArith1[i].p=(proc1)syDim; break;
@@ -3337 +3340 @@
 {
   res->data = rParStr((ring)v->Data());
-  return FALSE;
-}
-static BOOLEAN jjidMinEmbedding(leftv res, leftv v)
-{
-  res->data = (char *)idMinEmbedding((ideal)v->Data());
   return FALSE;
 }
@@ -3386 +3384 @@
 #define jjrVarStr      (proc1)rVarStr
 #define jjrParStr      (proc1)rParStr
-#define jjidMinEmbedding (proc1)idMinEmbedding
 #define jjCOUNT_R        (proc1)syLength
 #define jjDIM_R        (proc1)syDim
@@ -3581 +3578 @@
 ,{jjPRINT,      PRINT_CMD,       NONE,           LIST_CMD}
 ,{jjPRINT,      PRINT_CMD,       NONE,           DEF_CMD}
-,{jjidMinEmbedding, PRUNE_CMD,   XS(MODUL_CMD),  MODUL_CMD }
+,{jjPRUNE,      PRUNE_CMD,       MODUL_CMD,      MODUL_CMD }
 ,{kQHWeight,    QHWEIGHT_CMD,    INTVEC_CMD,     IDEAL_CMD }
 ,{kQHWeight,    QHWEIGHT_CMD,    INTVEC_CMD,     MODUL_CMD }

Singular/polys-impl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.cc,v 1.33 1999-11-15 17:20:39 obachman Exp $ */
+/* $Id: polys-impl.cc,v 1.34 1999-11-24 14:07:23 obachman Exp $ */
 
 /***************************************************************
@@ -890 +890 @@
     if (pComp(old,p)!=1)
     {
-      WarnS("wrong order (");
+      Warn("wrong order (");
       wrp(old);
       Print(") in %s:%d (pComp=%d)\n",f,l,pComp(old,p));

Singular/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.31 1999-11-19 16:42:42 obachman Exp $ */
+/* $Id: syz.cc,v 1.32 1999-11-24 14:07:23 obachman Exp $ */
 
 /*
@@ -382 +382 @@
     syMinStep(res[syzIndex-1],res[syzIndex]);
   if (!idIs0(res[0]))
-    idMinEmbedding(res[0]);
+    idMinEmbedding(res[0], TRUE);
 }