Changeset 704325e in git

Timestamp:

Nov 17, 1999, 11:51:04 AM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

87e389f2290616eea082667d75d97af307831fdc

Parents:

97d3c00617cfd87ee2359033f8b2ae1bbf23a456

Message:

* Assure_C_dp enabled (fixed  rCurrRingAssure_Global)


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

Location:

Singular

Files:

• extra.cc (modified) (3 diffs)
• ring.cc (modified) (7 diffs)
• ring.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.116 1999-11-16 12:39:26 obachman Exp $ */
+/* $Id: extra.cc,v 1.117 1999-11-17 10:51:04 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -51 +51 @@
 #include "feOpt.h"
 #include "distrib.h"
+#include "prCopy.h"
 
 // Define to enable many more system commands
@@ -1116 +1117 @@
     else
 #endif
+/*==================== thomas =================*/
+    if (strcmp(sys_cmd, "thomas") == 0)
+    {
+      poly p = (poly) h->Data();
+      ring cr = currRing;
+      ring r = rCurrRingAssure_C_dp();
+      poly p_r = prCopyR(p, cr);
+      pTest(p_r);
+      pWrite(p_r);
+      rChangeCurrRing(cr, TRUE);
+      return FALSE;
+    }
 /*==================== Error =================*/
       Werror( "system(\"%s\",...) %s", sys_cmd, feNotImplemented );

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.82 1999-11-15 17:20:44 obachman Exp $ */
+/* $Id: ring.cc,v 1.83 1999-11-17 10:51:02 obachman Exp $ */
 
 /*
@@ -80 +80 @@
 void rChangeCurrRing(ring r, BOOLEAN complete)
 {
-  rTest(r);
   /*------------ set global ring vars --------------------------------*/
   currRing = r;
@@ -86 +85 @@
   if (r != NULL)
   {
+    rTest(r);
     if (complete)
     {
@@ -894 +894 @@
       idDelete(&r->qideal);
       r->qideal=NULL;
-      rChangeCurrRing(savecurrRing,FALSE);
+      rChangeCurrRing(savecurrRing,TRUE);
     }
     int i=1;
@@ -3337 +3337 @@
   
 
-// use this fro global ordering consisting of two blocks
+// use this for global orderings consisting of two blocks
 static ring rCurrRingAssure_Global(rRingOrder_t b1, rRingOrder_t b2)
 {
   int r_blocks = rBlocks(currRing);
   int i;
+  
+  assume(b1 == ringorder_c || b1 == ringorder_C || 
+         b2 == ringorder_c || b1 == ringorder_C || 
+         b2 == ringorder_S);
   
   if (r_blocks == 2 && currRing->order[0] == b1 && currRing->order[2] == 0)
@@ -3353 +3357 @@
   res->order[0] = b1;
   res->order[1] = b2;
-  res->block0[0] = 1;
-  res->block1[0] = currRing->N;
+  if (b1 == ringorder_c || b1 == ringorder_C)
+  {
+    res->block0[1] = 1;
+    res->block1[1] = currRing->N;
+  }
+  else
+  {
+    res->block0[0] = 1;
+    res->block1[0] = currRing->N;
+  }
+  // HANNES: This sould be set in rComplete
   res->OrdSgn = 1;
   rComplete(res, 1);
@@ -3372 +3385 @@
 }
 
+ring rCurrRingAssure_C_dp()
+{
+  return rCurrRingAssure_Global(ringorder_C, ringorder_dp);
+}
+
+
 void rSetSyzComp(int k)
 {

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.40 1999-11-15 17:20:45 obachman Exp $ */
+/* $Id: ring.h,v 1.41 1999-11-17 10:51:04 obachman Exp $ */
 
 /* includes */
@@ -195 +195 @@
 ring   rCurrRingAssure_dp_S();
 ring   rCurrRingAssure_dp_C();
+ring   rCurrRingAssure_C_dp();
 // return the max-comonent wchich has syzIndex i
 // Assume: i<= syzIndex_limit