Changeset 3c0498 in git for Singular

Timestamp:

Mar 21, 2012, 8:29:49 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1f49983e2c0b18b90d6918660ec7a49d584e535e8c8dba7f7269572699622a97ae531f403418954a

Parents:

2d2c99cd52253e2a0a953a1aa32a55546c4a67cc

Message:

fix: minpoly in ringlist (Manaul/elimRing.tst)

Location:

Singular

Files:

• ipassign.cc (modified) (10 diffs)
• ipshell.cc (modified) (2 diffs)

Singular/ipassign.cc

@@ -58 +58 @@
 
 /*=================== proc =================*/
-static BOOLEAN jjECHO(leftv res, leftv a)
+static BOOLEAN jjECHO(leftv, leftv a)
 {
   si_echo=(int)((long)(a->Data()));
   return FALSE;
 }
-static BOOLEAN jjPRINTLEVEL(leftv res, leftv a)
+static BOOLEAN jjPRINTLEVEL(leftv, leftv a)
 {
   printlevel=(int)((long)(a->Data()));
   return FALSE;
 }
-static BOOLEAN jjCOLMAX(leftv res, leftv a)
+static BOOLEAN jjCOLMAX(leftv, leftv a)
 {
   colmax=(int)((long)(a->Data()));
   return FALSE;
 }
-static BOOLEAN jjTIMER(leftv res, leftv a)
+static BOOLEAN jjTIMER(leftv, leftv a)
 {
   timerv=(int)((long)(a->Data()));
@@ -80 +80 @@
 }
 #ifdef HAVE_GETTIMEOFDAY
-static BOOLEAN jjRTIMER(leftv res, leftv a)
+static BOOLEAN jjRTIMER(leftv, leftv a)
 {
   rtimerv=(int)((long)(a->Data()));
@@ -87 +87 @@
 }
 #endif
-static BOOLEAN jjMAXDEG(leftv res, leftv a)
+static BOOLEAN jjMAXDEG(leftv, leftv a)
 {
   Kstd1_deg=(int)((long)(a->Data()));
@@ -105 +105 @@
   return FALSE;
 }
-static BOOLEAN jjTRACE(leftv res, leftv a)
+static BOOLEAN jjTRACE(leftv, leftv a)
 {
   traceit=(int)((long)(a->Data()));
   return FALSE;
 }
-static BOOLEAN jjSHORTOUT(leftv res, leftv a)
+static BOOLEAN jjSHORTOUT(leftv, leftv a)
 {
   if (currRing != NULL)
@@ -180 +180 @@
   }
 }
-static BOOLEAN jjMINPOLY(leftv res, leftv a)
+static BOOLEAN jjMINPOLY(leftv, leftv a)
 {
   if( !nCoeff_is_transExt(currRing->cf) && (currRing->idroot == NULL) && n_IsZero((number)a->Data(), currRing->cf) )
@@ -209 +209 @@
     while(p != NULL)
     {
-      Print(p->String(TRUE)); PrintLn();
+      PrintS(p->String(TRUE)); PrintLn();
       p = p->next;
     }
@@ -282 +282 @@
   return FALSE;
 }
-static BOOLEAN jjNOETHER(leftv res, leftv a)
+static BOOLEAN jjNOETHER(leftv, leftv a)
 {
   poly p=(poly)a->CopyD(POLY_CMD);
@@ -798 +798 @@
 
   int i=0;
-  BOOLEAN nok=FALSE;
-
   if (lt==DEF_CMD)
   {
@@ -1197 +1195 @@
   return FALSE;
 }
-static BOOLEAN jjA_LIST_L(leftv l,leftv r)
-{
-  /*left side are something, right side are lists*/
-  /*e.g. a,b,c=l */
-  //int ll=l->listLength();
-  if (l->listLength()==1) return jiAssign_1(l,r);
-  BOOLEAN nok;
-  sleftv t;
-  leftv h;
-  lists L=(lists)r->Data();
-  int rl=L->nr;
-  int i=0;
-
-  memset(&t,0,sizeof(sleftv));
-  while ((i<=rl)&&(l!=NULL))
-  {
-    memset(&t,0,sizeof(sleftv));
-    t.Copy(&L->m[i]);
-    h=l->next;
-    l->next=NULL;
-    nok=jiAssign_1(l,&t);
-    if (nok) return TRUE;
-    i++;
-    l=h;
-  }
-  r->CleanUp();
-  return FALSE;
-}
 static BOOLEAN jiA_MATRIX_L(leftv l,leftv r)
 {
@@ -1304 +1274 @@
   /*the case s=t[1..4] is handled in iiAssign,
   * the case s[2..3]=t[3..4] is handled in iiAssgn_rec*/
-  int ll=l->listLength();
-  int rl=r->listLength();
   BOOLEAN nok=FALSE;
   sleftv t;

Singular/ipshell.cc

@@ -1654 +1654 @@
   // 3: qideal
   L->m[3].rtyp=IDEAL_CMD;
-  if (rMinpolyIsNULL(R))
+  if (nCoeff_is_transExt(R->cf))
     L->m[3].data=(void *)idInit(1,1);
   else
   {
-    const ring RR = R->cf->extRing;
-
-    L->m[3].data=(void *) idCopy(RR->minideal, RR);
+    ideal q=idInit(IDELEMS(r->minideal));
+    q->m[0]=p_Init(R);
+    pSetCoeff0(q->m[0],(number)(r->minideal->m[0]));
+    L->m[3].data=(void *)q;
 //    I->m[0] = pNSet(R->minpoly);
   }
@@ -2078 +2079 @@
 //        rParameter(R)[i]=(char *)omAlloc(10);
 //        sprintf(rParameter(R)[i],"@@(%d)",i+1);
-        
         omFree(R->names[j]);
         R->names[j]=(char *)omAlloc(10);