Changeset f50eb2 in git

Timestamp:

Jun 8, 2020, 6:26:41 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8b7ebfed239b67853aad0eec6fc2f727b9ec55d5ab7174f97f3aaf313466647c215f8a4bf78bcdaa

Parents:

fdda5465265805b57a9c0f85de0debd58cd07bee

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-06-08 18:26:41+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-06-08 18:30:54+02:00

Message:

jjSetMinpoly

Location:

Singular

Files:

• ipassign.cc (modified) (7 diffs)
• ipshell.h (modified) (1 diff)

Singular/ipassign.cc

@@ -171 +171 @@
   }
 }
-ring jjSetMinpoly(ring r, number a, BOOLEAN modify)
-{
-  if( !nCoeff_is_transExt(r->cf) && (r->idroot == NULL) && n_IsZero(a, r->cf) )
-  {
-    return r;
-  }
-
-
+ring jjSetMinpoly(ring r, number a)
+{
   if ( !nCoeff_is_transExt(r->cf) )
   {
@@ -187 +181 @@
     }
   }
-  if ((rVar(r->cf->extRing)!=1)
-  && !n_IsZero(a, r->cf) )
+  if (rVar(r->cf->extRing)!=1)
   {
     WerrorS("only univarite minpoly allowed");
@@ -194 +187 @@
   }
 
-  BOOLEAN redefine_from_algext=FALSE;
-  if ( r->idroot != NULL )
-  {
-    redefine_from_algext=(r->cf->extRing->qideal!=NULL);
-  }
-
-//  assume (r->idroot==NULL);
+  assume (r->idroot==NULL);
 
   number p = n_Copy(a,r->cf);
@@ -215 +202 @@
     return NULL;
   }
-  if (!modify) r=rCopy(r);
+  r=rCopy(r);
   // remove all object currently in the ring
-  while(r->idroot!=NULL)
-  {
-#ifndef SING_NDEBUG
-    Warn("killing a local object due to minpoly change: %s", IDID(r->idroot));
-#endif
-    killhdl2(r->idroot,&(r->idroot),r);
-  }
 
   AlgExtInfo A;
@@ -236 +216 @@
     // cleanup A: TODO
     rDelete( A.r );
-    if (!modify) rDelete(r);
+    rDelete(r);
     return NULL;
   }
-  if (!redefine_from_algext && (DEN((fraction)(p)) != NULL)) // minpoly must be a fraction with poly numerator...!!
+  if (DEN((fraction)(p)) != NULL) // minpoly must be a fraction with poly numerator...!!
   {
     poly n=DEN((fraction)(p));
@@ -250 +230 @@
   }
 
-  if (redefine_from_algext) q->m[0]=(poly)p;
-  else          q->m[0] = NUM((fraction)p);
+  q->m[0] = NUM((fraction)p);
   A.r->qideal = q;
 
-  if (!redefine_from_algext)
-  {
-    EXTERN_VAR omBin fractionObjectBin;
-    NUM((fractionObject *)p) = NULL; // not necessary, but still...
-    omFreeBin((ADDRESS)p, fractionObjectBin);
-  }
+  EXTERN_VAR omBin fractionObjectBin;
+  NUM((fractionObject *)p) = NULL; // not necessary, but still...
+  omFreeBin((ADDRESS)p, fractionObjectBin);
 
   coeffs new_cf = nInitChar(n_algExt, &A);
@@ -267 +243 @@
     // cleanup A: TODO
     rDelete( A.r );
-    if (!modify) rDelete(r);
+    rDelete(r);
     return NULL;
   }

Singular/ipshell.h

@@ -171 +171 @@
 /* Assigments : */
 BOOLEAN iiAssign(leftv left, leftv right, BOOLEAN toplevel=TRUE);
-ring jjSetMinpoly(ring r, number a, BOOLEAN modify);
+ring jjSetMinpoly(ring r, number a);
 
 typedef BOOLEAN (*proci)(leftv,leftv,Subexpr);