Changeset aec5c9 in git

Timestamp:

Apr 29, 2011, 2:51:47 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

bfa04ee2a025a85b141d50d577c0438ec69e4233

Parents:

760a78f4333abdcf36c17059f611fa15a34c2dac

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-04-29 14:51:47+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:31+01:00

Message:

minpoly replaced by minideal->m[0]; prep for longalg/longtrans

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (1 diff)
• polys/monomials/ring.cc (modified) (4 diffs)
• polys/monomials/ring.h (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -165 +165 @@
   ring          algring; //< implementation of extensions needs polynomials...
   /// for Q_a/Zp_a, rInit
-  number     minpoly;  //< make it a number! (needed for ring.cc) must be set by n???InitChar
+  ///number     minpoly;  //< no longer needed: replaced by
+                          //  algring->minideal->[0]
 
 
 //-------------------------------------------
-  char* compex_parameter; //< the name of sqrt(-1), i.e. 'i' or 'j' etc...?
+  char* complex_parameter; //< the name of sqrt(-1), i.e. 'i' or 'j' etc...?
 
 #ifdef HAVE_RINGS
   /* The following members are for representing the ring Z/n,
-     where n is not a prime. We distinguish three cases:
+     where n is not a prime. We distinguish four cases:
      1.) n has at least two distinct prime factors. Then
          modBase stores n, modExponent stores 1, modNumber

libpolys/polys/monomials/ring.cc

@@ -1559 +1559 @@
   {
     if ( rMinpolyIsNULL(r2) ) return FALSE;
-    if (! n_Equal(r1->cf->minpoly, r2->cf->minpoly, r1->cf)) return FALSE;
+    if (! n_Equal(r1->cf->algring->minideal->m[0],
+                  r2->cf->algring->minideal->m[0], r1->cf)) return FALSE;
   }
   else if (!rMinpolyIsNULL(r2)) return FALSE;
@@ -1630 +1631 @@
   if (r2->order[i] != 0) return FALSE;
 
-  // we do not check minpoly
+  // we do not check minpoly/minideal
   // we do not check qideal
 
@@ -1985 +1986 @@
 
   if (!rMinpolyIsNULL(r))
-    omCheckAddr(r->cf->minpoly);
+    omCheckAddr(r->cf->algring->minideal->m[0]);
 
   //assume(r->cf!=NULL);
@@ -5394 +5395 @@
     const ring R = C->algring;
     assume( R != NULL );
-    return idIs0(R->qideal);
+    return idIs0(R->minideal);
   }
   return TRUE;

libpolys/polys/monomials/ring.h

@@ -197 +197 @@
   int*       block1; /* ending pos., rInit/rSleftvOrdering2Ordering*/
 //  char**     parameter; /* names of parameters, rInit */
-//  number     minpoly;  /* for Q_a/Zp_a, rInit */
-  ideal      minideal;
+//  number     minpoly;  /* replaced by minideal->m[0] */
+  ideal      minideal;   /* for Q_a/Zp_a, rInit;
+                            for a start, we assume that there is either no
+                            or exactly one generator in minideal, playing
+                            the role of the former minpoly; minideal may
+                            also be NULL which coincides with the
+                            no-generator-case */
   int**      wvhdl;  /* array of weight vectors, rInit/rSleftvOrdering2Ordering */
   char **    names;  /* array of variable names, rInit */