Changeset 03bf55 in git

Timestamp:

Apr 21, 2011, 11:54:15 AM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c7e3d79fd9a3b15014fb3938e83d45f7eb0893c1

Parents:

17e473accf9564b8b0b38cf730a72e24272bad8a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-21 11:54:15+02:00

git-committer:

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

Message:

FIX: adaptation of var. name changes for arithmetik rings

coauthor: Frank Seelisch

Location:

libpolys/polys/monomials

Files:

• ring.cc (modified) (7 diffs)
• ring.h (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -290 +290 @@
   else if (rField_is_Ring(r))
   {
-    TODO(Frank, "Please consider addapting the variable names...");
-    
     PrintS("//   coeff. ring is : ");
     if (rField_is_Ring_Z(r)) PrintS("Integers\n");
-/*
-    long l = (long)mpz_sizeinbase(r->ringflaga, 10) + 2;
+    long l = (long)mpz_sizeinbase(r->cf->modBase, 10) + 2;
     char* s = (char*) omAlloc(l);
-    mpz_get_str(s,10,r->ringflaga);
+    mpz_get_str(s,10,r->cf->modBase);
     if (rField_is_Ring_ModN(r)) Print("Z/%s\n", s);
-    if (rField_is_Ring_2toM(r)) Print("Z/2^%lu\n", r->ringflagb);
-    if (rField_is_Ring_PtoM(r)) Print("Z/%s^%lu\n", s, r->ringflagb);
+    if (rField_is_Ring_2toM(r)) Print("Z/2^%lu\n", r->cf->modExponent);
+    if (rField_is_Ring_PtoM(r)) Print("Z/%s^%lu\n", s, r->cf->modExponent);
     omFreeSize((ADDRESS)s, l);
-*/  
   }
 #endif
@@ -529 +525 @@
   }
 #ifdef HAVE_RINGS
-  TODO(Frank, "Please consider addapting the variable names...");
-/*
-  if (r->ringflaga != NULL)
-  {
-    mpz_clear(r->ringflaga);
-    omFree((ADDRESS)r->ringflaga);
-  }
-  if (r->nrnModul != NULL)
-  {
-    mpz_clear(r->nrnModul);
-    omFree((ADDRESS)r->nrnModul);
-  }
-*/
+  if (r->cf->modBase != NULL)
+  {
+    mpz_clear(r->cf->modBase);
+    omFree((ADDRESS)r->cf->modBase);
+  }
+  if (r->cf->modNumber != NULL)
+  {
+    mpz_clear(r->cf->modNumber);
+    omFree((ADDRESS)r->cf->modNumber);
+  }
 #endif
   omFreeBin(r, sip_sring_bin);
@@ -660 +653 @@
 
 #ifdef HAVE_RINGS
-  TODO(Frank, "Please consider addapting the variable names...");
-/*
   if (rField_is_Ring_Z(r))
   {
@@ -670 +661 @@
   {
     char* s = (char*) omAlloc(7+10+2);
-    sprintf(s,"integer,%lu",r->ringflagb);
+    sprintf(s,"integer,%lu",r->cf->modExponent);
     return s;
   }
   if(rField_is_Ring_ModN(r))
   {
-    long l = (long)mpz_sizeinbase(r->ringflaga, 10) + 2+7;
+    long l = (long)mpz_sizeinbase(r->cf->modBase, 10) + 2+7;
     char* s = (char*) omAlloc(l);
-    gmp_sprintf(s,"integer,%Zd",r->ringflaga);
+    gmp_sprintf(s,"integer,%Zd",r->cf->modBase);
     return s;
   }
   if(rField_is_Ring_PtoM(r))
   {
-    long l = (long)mpz_sizeinbase(r->ringflaga, 10) + 2+7+10;
+    long l = (long)mpz_sizeinbase(r->cf->modBase, 10) + 2+7+10;
     char* s = (char*) omAlloc(l);
-    gmp_sprintf(s,"integer,%Zd^%lu",r->ringflaga,r->ringflagb);
+    gmp_sprintf(s,"integer,%Zd^%lu",r->cf->modBase,r->cf->modExponent);
     return s;
   }
-*/
 #endif
   if (r->parameter==NULL)
@@ -791 +781 @@
 {
 #ifdef HAVE_RINGS
-  TODO(Frank, "Please consider addapting the variable names...");
-/*
   if (rField_is_Ring_2toM(r))
-    return binaryPower(2, (int)(unsigned long)r->ringflagb);
+    return binaryPower(2, (int)(unsigned long)r->cf->modExponent);
   if (rField_is_Ring_ModN(r))
-    return (int)mpz_get_ui(r->ringflaga);
+    return (int)mpz_get_ui(r->cf->modBase);
   if (rField_is_Ring_PtoM(r))
-    return binaryPower((int)mpz_get_ui(r->ringflaga),
-                       (int)(unsigned long)r->ringflagb);
-*/
+    return binaryPower((int)mpz_get_ui(r->cf->modBase),
+                       (int)(unsigned long)r->cf->modExponent);
+  
 #endif
   if (rField_is_numeric(r))
@@ -1634 +1622 @@
   res->ch=r->ch;     /* characteristic */
 #ifdef HAVE_RINGS
-  TODO(Frank, "Please consider addapting the variable names...");
-/*
-  res->ringtype=r->ringtype;  // cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m
-  if (r->ringflaga!=NULL)
-  {
-    res->ringflaga = (int_number) omAlloc(sizeof(mpz_t));
-    mpz_init_set(res->ringflaga,r->ringflaga);
-  }
-  res->ringflagb=r->ringflagb;
-  if (r->nrnModul!=NULL)
-  {
-    res->nrnModul = (int_number) omAlloc(sizeof(mpz_t));
-    mpz_init_set(res->nrnModul,r->nrnModul);
-  }
-*/
+  res->cf->ringtype = r->cf->ringtype;  // cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m
+  if (r->cf->modBase!=NULL)
+  {
+    res->cf->modBase = (int_number) omAlloc(sizeof(mpz_t));
+    mpz_init_set(res->cf->modBase,r->cf->modBase);
+  }
+  res->cf->modExponent=r->cf->modExponent;
+  if (r->cf->modNumber!=NULL)
+  {
+    res->cf->modNumber = (int_number) omAlloc(sizeof(mpz_t));
+    mpz_init_set(res->cf->modNumber,r->cf->modNumber);
+  }
 #endif
   //memset: res->ref=0; /* reference counter to the ring */
@@ -1705 +1690 @@
   res->options=r->options;
 #ifdef HAVE_RINGS
-  TODO(Frank, "Please consider addapting the variable names...");
-//  res->ringtype=r->ringtype;
+  res->cf->ringtype=r->cf->ringtype;
 #endif
   //

libpolys/polys/monomials/ring.h

@@ -225 +225 @@
                             the highest monomial below pHEdge */
 // #ifdef HAVE_RINGS
-//   unsigned int  ringtype;  /* cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m */
-//   int_number    ringflaga; /* Z/(ringflag^ringflagb)=Z/nrnModul*/
-//   unsigned long ringflagb;
-//   unsigned long nr2mModul;  /* Z/nr2mModul */
-//   int_number    nrnModul;
+//   unsigned int  cf->ringtype;  /* cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m */
+//   int_number    cf->modBase; /* Z/(ringflag^cf->modExponent)=Z/cf->modNumber*/
+//   unsigned long cf->modExponent;
+//   unsigned long cf->modNumber;  /* Z/cf->modNumber */
+//   int_number    cf->modNumber;
 // #endif