Changeset 868d77d in git

Timestamp:

May 19, 2014, 7:19:22 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

984ff3b24d0cfc0f0c40172a5ef29ced17fd6741a93f95f272cf2777251e0e930411dedb45d02ba0

Parents:

cb6d87e20317d2aae47858d41fd24da57247554d

Message:

fix: ssi: sending OrdSgn==-1

Files:

• Singular/links/ssiLink.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)

Singular/links/ssiLink.cc

@@ -101 +101 @@
 void ssiSetCurrRing(const ring r)
 {
+  //  if (currRing!=NULL)
+  //  Print("need to change the ring, currRing:%s, switch to: ssiRing%d\n",IDID(currRingHdl,nr);
+  //  else
+  //  Print("no ring, switch to ssiRing%d\n",nr);
   if (!rEqual(r,currRing,1))
   {
@@ -1375 +1379 @@
              break;
   }
+  // if currRing is required for the result, but lost
+  // define "ssiRing%d" as currRing:
+  if ((d->r!=NULL)
+  && (currRing!=d->r)
+  && (res->RingDependend()))
+  {
+    ssiSetCurrRing(d->r);
+  }
   return res;
 no_ring: WerrorS("no ring");

libpolys/polys/monomials/ring.cc

@@ -1608 +1608 @@
   if (r1 == r2) return TRUE;
   if (r1 == NULL || r2 == NULL) return FALSE;
+  if (r1->cf!=r2->cf) return FALSE;
+  if (rVar(r1)!=rVar(r2)) return FALSE;
 
   if( !rSamePolyRep(r1, r2) )
@@ -1614 +1616 @@
   int i/*, j*/;
 
-  assume( r1->cf == r2->cf );
-  assume( rVar(r1) == rVar(r2) );
-
   for (i=0; i<rVar(r1); i++)
   {
-    if (r1->names[i] != NULL && r2->names[i] != NULL)
+    if ((r1->names[i] != NULL) && (r2->names[i] != NULL))
     {
       if (strcmp(r1->names[i], r2->names[i])) return FALSE;
@@ -3767 +3766 @@
   int jj;
   int oo=-1;
+  int notfound=1;
   for(jj=i-1;jj>=0;jj--)
   {
@@ -3784 +3784 @@
       }
       oo=res;
+      notfound=0;
     }
     r->OrdSgn=oo;
   }
+  if (notfound
+  && (r->order[i]==ringorder_ls)
+     || (r->order[i]==ringorder_ds)
+     || (r->order[i]==ringorder_Ds)
+     || (r->order[i]==ringorder_ws)
+     || (r->order[i]==ringorder_Ws)
+     || (r->order[i]==ringorder_rs)
+  )
+    r->OrdSgn=-1;
 }