Changeset cf42ab1 in git for Singular/ring.cc

Timestamp:

Dec 6, 2000, 12:03:33 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

81d00f6c5e73ee2ae0294081b3eb6ffc9485748f

Parents:

f7dade6bf24bb053c360ca399d303c8ffa2cc6da

Message:

*hannes: ring changes don't have complete any more


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

File:

• Singular/ring.cc (modified) (18 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.146 2000-11-25 13:02:09 Singular Exp $ */
+/* $Id: ring.cc,v 1.147 2000-12-06 11:03:27 Singular Exp $ */
 
 /*
@@ -84 +84 @@
 // complete == FALSE : only delete operations are enabled
 // complete == TRUE  : full reset of all variables
-void rChangeCurrRing(ring r, BOOLEAN complete)
+void rChangeCurrRing(ring r)
 {
   /*------------ set global ring vars --------------------------------*/
@@ -92 +92 @@
   {
     rTest(r);
-    if (complete)
-    {
-      /*------------ set global ring vars --------------------------------*/
-      currQuotient=r->qideal;
-      /*------------ set redTail, except reset by nSetChar or pSetGlobals */
-      test |= Sy_bit(OPT_REDTAIL);
-    }
+    /*------------ set global ring vars --------------------------------*/
+    currQuotient=r->qideal;
+    /*------------ set redTail, except reset by nSetChar or pSetGlobals */
+    test |= Sy_bit(OPT_REDTAIL);
 
     /*------------ global variables related to coefficients ------------*/
-    nSetChar(r, complete);
+    nSetChar(r);
 
     /*------------ global variables related to polys -------------------*/
-    pSetGlobals(r, complete);
-
-    if (complete)
-    {
+    pSetGlobals(r);
+
     /*------------ set naMinimalPoly -----------------------------------*/
-      if (r->minpoly!=NULL)
-      {
-        naMinimalPoly=((lnumber)r->minpoly)->z;
-      }
-    }
-  }
-}
-
-void rSetHdl(idhdl h, BOOLEAN complete)
+    if (r->minpoly!=NULL)
+    {
+      naMinimalPoly=((lnumber)r->minpoly)->z;
+    }
+  }
+}
+
+void rSetHdl(idhdl h)
 {
   int i;
@@ -129 +123 @@
     rTest(rg);
   }
-  else complete=FALSE;
 
   // clean up history
@@ -140 +133 @@
 
    /*------------ change the global ring -----------------------*/
-  rChangeCurrRing(rg,complete);
+  rChangeCurrRing(rg);
   currRingHdl = h;
 }
@@ -189 +182 @@
   /* complete ring intializations */
   rComplete(r);
-  rSetHdl(tmp,TRUE);
+  rSetHdl(tmp);
   return currRingHdl;
 }
@@ -1290 +1283 @@
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r1,TRUE);
+          nSetChar(r1);
           if ((strcmp(r1->parameter[0],r2->parameter[0])==0) /* 1 char */
               && naEqual(r1->minpoly,r2->minpoly))
@@ -1298 +1291 @@
             tmpR.minpoly=naCopy(r1->minpoly);
             tmpR.P=1;
-            nSetChar(currRing,TRUE);
+            nSetChar(currRing);
           }
           else
           {
-            nSetChar(currRing,TRUE);
+            nSetChar(currRing);
             WerrorS("different minpolys");
             return -1;
@@ -1315 +1308 @@
             tmpR.parameter[0]=omStrDup(r1->parameter[0]);
             tmpR.P=1;
-            nSetChar(r1,TRUE);
+            nSetChar(r1);
             tmpR.minpoly=naCopy(r1->minpoly);
-            nSetChar(currRing,TRUE);
+            nSetChar(currRing);
           }
           else
@@ -1336 +1329 @@
             tmpR.parameter[0]=omStrDup(r1->parameter[0]);
             tmpR.P=1;
-            nSetChar(r2,TRUE);
+            nSetChar(r2);
             tmpR.minpoly=naCopy(r2->minpoly);
-            nSetChar(currRing,TRUE);
+            nSetChar(currRing);
           }
           else
@@ -1390 +1383 @@
         if (r1->minpoly!=NULL)
         {
-          nSetChar(r1,TRUE);
+          nSetChar(r1);
           tmpR.minpoly=naCopy(r1->minpoly);
-          nSetChar(currRing,TRUE);
+          nSetChar(currRing);
         }
       }
@@ -1416 +1409 @@
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r1,TRUE);
+          nSetChar(r1);
           tmpR.minpoly=naCopy(r2->minpoly);
-          nSetChar(currRing,TRUE);
+          nSetChar(currRing);
         }
       }
@@ -1451 +1444 @@
         if (r1->minpoly!=NULL)
         {
-          nSetChar(r1,TRUE);
+          nSetChar(r1);
           tmpR.minpoly=naCopy(r1->minpoly);
-          nSetChar(currRing,TRUE);
+          nSetChar(currRing);
         }
       }
@@ -1480 +1473 @@
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r2,TRUE);
+          nSetChar(r2);
           tmpR.minpoly=naCopy(r2->minpoly);
-          nSetChar(currRing,TRUE);
+          nSetChar(currRing);
         }
       }
@@ -3457 +3450 @@
   {
     ring old_ring = currRing;
-    rChangeCurrRing(r, TRUE);
+    rChangeCurrRing(r);
     if (old_ring->qideal != NULL)
     {
@@ -3543 +3536 @@
   {
     ring old_r = currRing;
-    rChangeCurrRing(new_r, TRUE);
+    rChangeCurrRing(new_r);
     if (old_r->qideal != NULL)
     {
@@ -3563 +3556 @@
     if (new_r_1 != new_r && new_r_1 != old_r) rDelete(new_r_1);
     rComplete(new_r, 1);
-    rChangeCurrRing(new_r, TRUE);
+    rChangeCurrRing(new_r);
     if (old_r->qideal != NULL)
     {
@@ -3609 +3602 @@
   res->OrdSgn = 1;
   rComplete(res, 1);
-  rChangeCurrRing(res, TRUE);
+  rChangeCurrRing(res);
   return res;
 }