Changeset fd1b0f2 in git

Timestamp:

Mar 22, 2011, 6:27:39 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3dc79f5be96137afb3180f6e28f682a770b75f47

Parents:

b840b19c135b83494f50c51413afda4d052cb150

Message:

FIX: 'hres' uses syRing and returns the result in re/orderedRes...

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

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

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/syz1.cc (modified) (1 diff)

Singular/iparith.cc

@@ -2976 +2976 @@
        return TRUE;
     }
+    if(currRing->N == 1)
+      WarnS("the current implementation of `lres` may not work in the case of a single variable");
     r=syLaScala3(u_id,&dummy);
   }
@@ -3025 +3027 @@
 
   // test the La Scala case' output
-  assume( (iiOp == LRES_CMD) == (r->syRing != NULL) );
-  assume( (iiOp == LRES_CMD) == (r->resPairs != NULL) );
-  assume( (r->minres != NULL) || (r->fullres != NULL) );
-
+  assume( ((iiOp == LRES_CMD) || (iiOp == HRES_CMD)) == (r->syRing != NULL) );
+  assume( (r->syRing != NULL) == (r->resPairs != NULL) );
+
+  if(iiOp != HRES_CMD)
+    assume( (r->minres != NULL) || (r->fullres != NULL) ); // is wrong for HRES_CMD...
+  else
+    assume( (r->orderedRes != NULL) || (r->res != NULL) ); // analog for hres...
+
+  
   return FALSE;
 }

kernel/syz1.cc

@@ -1640 +1640 @@
     if ((syzstr->syRing != NULL) && (syzstr->syRing != r))
     {
-      rNChangeSComps(NULL, NULL, syzstr->syRing);
+      if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)
+        rNChangeSComps(NULL, NULL, syzstr->syRing);
+      
       rKill(syzstr->syRing);
     }