Changeset 0c2f6d in git

Timestamp:

Mar 14, 2011, 3:14:52 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

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

Children:

60dcbbcf58b25703c21825b7ca27f49816799c04

Parents:

c45b8f0f687660a48dbd370b13e50f821a3fb531

Message:

removed further assume violations

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

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipshell.cc (modified) (1 diff)

Singular/iparith.cc

@@ -2013 +2013 @@
         par_perm_size=rPar(r);
         BITSET save_test=test;
-        ntSetChar(rInternalChar(r),r);
+        if ((r->minpoly != NULL) || (r->minideal != NULL))
+          naSetChar(rInternalChar(r),r);
+        else ntSetChar(rInternalChar(r),r);
         nSetChar(currRing);
         test=save_test;

Singular/ipshell.cc

@@ -2339 +2339 @@
             par_perm_size=rPar(orig_ring);
             BITSET save_test=test;
-            ntSetChar(rInternalChar(orig_ring),orig_ring);
+            if ((orig_ring->minpoly != NULL) || (orig_ring->minideal != NULL))
+              naSetChar(rInternalChar(orig_ring),orig_ring);
+            else ntSetChar(rInternalChar(orig_ring),orig_ring);
             nSetChar(currRing);
             test=save_test;