Changeset 52d480 in git

Timestamp:

Feb 28, 2012, 6:36:11 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

d8b0f69f9828897dca663d5bb516369b1b0ac64a

Parents:

d901095118d1ee38940016e9b6c108a54485ac2a

Message:

fix: qring for rings with cf=ring

File:

• Singular/ipassign.cc (modified) (10 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
-
 /*
 * ABSTRACT: interpreter:
@@ -189 +187 @@
     WarnS("Set minpoly over non-transcendental ground field to 0?!");
 #endif
-    return FALSE;    
-  }
-   
-   
+    return FALSE;
+  }
+
+
   if ( !nCoeff_is_transExt(currRing->cf) )
   {
@@ -204 +202 @@
   {
 //    return TRUE;
-#ifndef NDEBUG      
+#ifndef NDEBUG
     idhdl p = currRing->idroot;
 
@@ -213 +211 @@
       Print(p->String(TRUE)); PrintLn();
       p = p->next;
-    }    
+    }
 #endif
   }
 
   assume (currRing->idroot==NULL);
-  
+
   number p = (number)a->CopyD(NUMBER_CMD);
 
@@ -225 +223 @@
     n_Delete(&p, currRing);
 
-    
+
     if( nCoeff_is_transExt(currRing->cf) )
     {
-#ifndef NDEBUG      
+#ifndef NDEBUG
       WarnS("minpoly is already 0...");
 #endif
@@ -235 +233 @@
 
     WarnS("cannot set minpoly to 0 / alg. extension?");
-    
+
 //    return TRUE;
   }
@@ -247 +245 @@
     killhdl2(currRing->idroot,&(currRing->idroot),currRing);
   }
-  
+
   n_Normalize(p, currRing->cf);
 
   AlgExtInfo A;
-  
+
   A.r = currRing->cf->extRing; // Use the same ground field!
   A.i = idInit(1,1);
 
   assume( DEN((fractionObject *)(p)) == NULL ); // minpoly must be a poly...!?
-  
+
   A.i->m[0] = NUM((fractionObject *)p);
 
@@ -268 +266 @@
 
   NUM((fractionObject *)p) = NULL; n_Delete(&p, currRing->cf);
-  
+
   coeffs new_cf = nInitChar(n_algExt, &A);
-  
+
   if (new_cf==NULL)
   {
@@ -692 +690 @@
   if (rField_is_Ring(currRing))
   {
-    int constIndex = idPosConstant(id);
-    if (constIndex != -1)
-    WerrorS("ideal contains constant; please modify ground field/ring instead");
-    return TRUE;
+    if (idPosConstant(id) != -1)
+    {
+      WerrorS("constant in q-ideal; please modify ground field/ring instead");
+      return TRUE;
+    }
   }
 #endif
@@ -1748 +1747 @@
       {
         case IDEAL_CMD:
-        case MODUL_CMD:
+        case MODUL_CMD:
         {
           ideal F=idInit(1,1);