Changeset f3e438 in git

Timestamp:

Feb 22, 2013, 12:56:42 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

892dd80edda39f846824ca997ef834ad6d19f748f449e4fcbc53c8f7ade0b4ec4da1190546211c70

Parents:

09b7bce0079d364dd3737b155c8efd91fd7b8708b39b313ad9473a1c407b71dc0c6f79d1a3063486

Message:

Merge pull request #298 from jankoboehm/spielwiese

Fix for integer std

Files:

• Singular/ipassign.cc (modified) (1 diff)
• libpolys/coeffs/rintegers.cc (modified) (1 diff)
• libpolys/polys/polys0.cc (modified) (1 diff)

Singular/ipassign.cc

@@ -216 +216 @@
   }
 
-  assume (currRing->idroot==NULL);
+//  assume (currRing->idroot==NULL);
 
   number p = (number)a->CopyD(NUMBER_CMD);

libpolys/coeffs/rintegers.cc

@@ -418 +418 @@
   r->cfPower = nrzPower;
   r->cfGcd  = nrzGcd;
-  r->cfLcm  = nrzGcd;
+  r->cfLcm  = nrzLcm;
   r->cfDelete= nrzDelete;
   r->cfSetMap = nrzSetMap;

libpolys/polys/polys0.cc

@@ -147 +147 @@
     while (p!=NULL)
     {
-      assume(!n_IsZero(p->coef,tailRing->cf));
+      assume((p->coef==NULL)||(!n_IsZero(p->coef,tailRing->cf)));
       if ((p->coef==NULL)||n_GreaterZero(p->coef,tailRing->cf))
         StringAppendS("+");