Changeset 05c60b2 in git

Timestamp:

May 30, 2014, 3:42:06 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

75424e3a56f41323abd6d3f9936e00e102ff6a6d

Parents:

d9dfcea84bd0d2eb3427c96d4f714a02c904ad87

Message:

toward poly as number

Location:

libpolys

Files:

• coeffs/numbers.cc (modified) (1 diff)
• polys/ext_fields/algext.cc (modified) (10 diffs)

libpolys/coeffs/numbers.cc

@@ -413 +413 @@
     assume(n->cfInpNeg!=NULL);
     assume(n->cfCopy!=NULL);
-    assume(n->cfRePart!=NULL);
-    assume(n->cfImPart!=NULL);
 
     assume(n->cfWriteLong!=NULL);

libpolys/polys/ext_fields/algext.cc

@@ -98 +98 @@
 void     naWriteLong(number &a, const coeffs cf);
 void     naWriteShort(number &a, const coeffs cf);
-number   naRePart(number a, const coeffs cf);
-number   naImPart(number a, const coeffs cf);
 number   naGetDenom(number &a, const coeffs cf);
 number   naGetNumerator(number &a, const coeffs cf);
@@ -248 +246 @@
 BOOLEAN naDBTest(number a, const char *f, const int l, const coeffs cf)
 {
-  assume(getCoeffType(cf) == ID);
   if (a == NULL) return TRUE;
   p_Test((poly)a, naRing);
-  if((((poly)a)!=naMinpoly)
-  && p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing)
-  && (p_Totaldegree((poly)a, naRing)> 1)) // allow to output par(1)
-  {
-    dReportError("deg >= deg(minpoly) in %s:%d\n",f,l);
-    return FALSE;
+  if (getCoeffType(cf)==n_algExt)
+  {
+    if((((poly)a)!=naMinpoly)
+    && p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing)
+    && (p_Totaldegree((poly)a, naRing)> 1)) // allow to output par(1)
+    {
+      dReportError("deg >= deg(minpoly) in %s:%d\n",f,l);
+      return FALSE;
+    }
   }
   return TRUE;
@@ -348 +348 @@
   if (a != NULL) a = (number)p_Neg((poly)a, naRing);
   return a;
-}
-
-number naImPart(number a, const coeffs cf)
-{
-  naTest(a);
-  return NULL;
 }
 
@@ -486 +480 @@
   poly aPlusB = p_Add_q(p_Copy((poly)a, naRing),
                         p_Copy((poly)b, naRing), naRing);
-  definiteReduce(aPlusB, naMinpoly, cf);
+  //definiteReduce(aPlusB, naMinpoly, cf);
   return (number)aPlusB;
 }
@@ -497 +491 @@
   if (a == NULL) return (number)minusB;
   poly aMinusB = p_Add_q(p_Copy((poly)a, naRing), minusB, naRing);
-  definiteReduce(aMinusB, naMinpoly, cf);
+  //definiteReduce(aMinusB, naMinpoly, cf);
   return (number)aMinusB;
 }
@@ -724 +718 @@
 static BOOLEAN naCoeffIsEqual(const coeffs cf, n_coeffType n, void * param)
 {
-  if (ID != n) return FALSE;
+  if (n_algExt != n) return FALSE;
   AlgExtInfo *e = (AlgExtInfo *)param;
   /* for extension coefficient fields we expect the underlying
@@ -1421 +1415 @@
   e->r->ref ++; // increase the ref.counter for the ground poly. ring!
   const ring R = e->r; // no copy!
-  assume( R->qideal == e->r->qideal );
   cf->extRing  = R;
 
@@ -1445 +1438 @@
   cf->cfChineseRemainder= naChineseRemainder;
   cf->cfInt          = naInt;
-  cf->cfInpNeg          = naNeg;
+  cf->cfInpNeg       = naNeg;
   cf->cfAdd          = naAdd;
   cf->cfSub          = naSub;
@@ -1467 +1460 @@
   cf->cfGetNumerator = naGetNumerator;
   cf->cfRePart       = naCopy;
-  cf->cfImPart       = naImPart;
   cf->cfCoeffWrite   = naCoeffWrite;
   cf->cfNormalize    = naNormalize;
@@ -1503 +1495 @@
 template class IAccessor<snumber*>;
 
+/* --------------------------------------------------------------------*/
+#if 0
+void npolyCoeffWrite(const coeffs cf, BOOLEAN details)
+{
+  assume( cf != NULL );
+
+  const ring A = cf->extRing;
+
+  assume( A != NULL );
+  Print("// polynomial ring as coefficient ring :\n");
+  rWrite(A);
+  PrintLn();
+}
+number npolyMult(number a, number b, const coeffs cf)
+{
+  naTest(a); naTest(b);
+  if ((a == NULL)||(b == NULL)) return NULL;
+  poly aTimesB = p_Mult_q(p_Copy((poly)a, naRing),
+                          p_Copy((poly)b, naRing), naRing);
+  return (number)aTimesB;
+}
+
+number npolyDiv(number a, number b, const coeffs cf)
+{
+  naTest(a); naTest(b);
+  if (b == NULL) WerrorS(nDivBy0);
+  if (a == NULL) return NULL;
+  poly p=singclap_pdivide((poly)a,(poly)b,naRing);
+  return (number)p;
+}
+
+
+BOOLEAN npolyInitChar(coeffs cf, void * infoStruct)
+{
+  assume( infoStruct != NULL );
+
+  AlgExtInfo *e = (AlgExtInfo *)infoStruct;
+  /// first check whether cf->extRing != NULL and delete old ring???
+
+  assume(e->r                     != NULL);      // extRing;
+  assume(e->r->cf                 != NULL);      // extRing->cf;
+
+  assume( cf != NULL );
+
+  e->r->ref ++; // increase the ref.counter for the ground poly. ring!
+  const ring R = e->r; // no copy!
+  cf->extRing  = R;
+
+  /* propagate characteristic up so that it becomes
+     directly accessible in cf: */
+  cf->ch = R->cf->ch;
+
+  cf->cfCoeffString = naCoeffString;
+
+  cf->cfGreaterZero  = naGreaterZero;
+  cf->cfGreater      = naGreater;
+  cf->cfEqual        = naEqual;
+  cf->cfIsZero       = naIsZero;
+  cf->cfIsOne        = naIsOne;
+  cf->cfIsMOne       = naIsMOne;
+  cf->cfInit         = naInit;
+  cf->cfInit_bigint  = naInit_bigint;
+  cf->cfFarey        = naFarey;
+  cf->cfChineseRemainder= naChineseRemainder;
+  cf->cfInt          = naInt;
+  cf->cfInpNeg       = naNeg;
+  cf->cfAdd          = naAdd;
+  cf->cfSub          = naSub;
+  cf->cfMult         = npolyMult;
+  cf->cfDiv          = npolyDiv;
+  cf->cfPower        = naPower;
+  cf->cfCopy         = naCopy;
+
+  cf->cfWriteLong        = naWriteLong;
+
+  if( rCanShortOut(naRing) )
+    cf->cfWriteShort = naWriteShort;
+  else
+    cf->cfWriteShort = naWriteLong;
+
+  cf->cfRead         = naRead;
+  cf->cfDelete       = naDelete;
+  cf->cfSetMap       = naSetMap;
+  cf->cfGetDenom     = naGetDenom;
+  cf->cfGetNumerator = naGetNumerator;
+  cf->cfRePart       = naCopy;
+  cf->cfCoeffWrite   = npolyCoeffWrite;
+  cf->cfNormalize    = npolyNormalize;
+  cf->cfKillChar     = naKillChar;
+#ifdef LDEBUG
+  cf->cfDBTest       = naDBTest;
+#endif
+  cf->cfGcd          = naGcd;
+  cf->cfLcm          = naLcmContent;
+  cf->cfSize         = naSize;
+  cf->nCoeffIsEqual  = naCoeffIsEqual;
+  cf->cfInvers       = npolyInvers;
+  cf->cfIntDiv       = npolyDiv;
+  cf->convFactoryNSingN=naConvFactoryNSingN;
+  cf->convSingNFactoryN=naConvSingNFactoryN;
+  cf->cfParDeg = naParDeg;
+
+  cf->iNumberOfParameters = rVar(R);
+  cf->pParameterNames = (const char**)R->names;
+  cf->cfParameter = naParameter;
+  cf->has_simple_Inverse=FALSE;
+  /* cf->has_simple_Alloc= FALSE; */
+
+  if( nCoeff_is_Q(R->cf) )
+  {
+    cf->cfClearContent = naClearContent;
+    cf->cfClearDenominators = naClearDenominators;
+  }
+
+  return FALSE;
+}
+#endif