Changeset 17e473 in git for libpolys/polys/monomials/ring.cc

Timestamp:

Apr 20, 2011, 9:43:24 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

03bf555de3ab718b020a7fd0a086b5c2e493dbd0

Parents:

1ddd044275ba5d4433a597ff9edee1abfce81a0e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-20 21:43:24+02:00

git-committer:

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

Message:

FIX: we can link against libpolys
FIX: rField_*(r...) all should call corresponding nCoeff_*(r->cf...)
ADD: first tests of polynomial rings

TODO for Frank: change ring.* wrt ring-related variables (moved to coeffs &&& renamed!)
TODO: poly. algs. over rings are UNusable at the moment

File:

• libpolys/polys/monomials/ring.cc (modified) (16 diffs)

libpolys/polys/monomials/ring.cc

@@ -138 +138 @@
 ring rDefault(coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
 {
+  assume( cf != NULL);
   ring r=(ring) omAlloc0Bin(sip_sring_bin);
   r->ch    = n_GetChar(cf);
@@ -167 +168 @@
   if (ch==0) cf=nInitChar(n_Q,NULL);
   else       cf=nInitChar(n_Zp,(void*)(long)ch);
+  assume( cf != NULL);
   return rDefault(cf,N,n,ord_size,ord,block0,block1);
 }
 ring   rDefault(coeffs cf, int N, char **n)
 {  
+  assume( cf != NULL);
   /*order: lp,0*/
   int *order = (int *) omAlloc(2* sizeof(int));
@@ -190 +193 @@
   if (ch==0) cf=nInitChar(n_Q,NULL);
   else       cf=nInitChar(n_Zp,(void*)(long)ch);
+  assume( cf != NULL);
   return rDefault(cf,N,n);
 }
@@ -286 +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;
     char* s = (char*) omAlloc(l);
@@ -295 +302 @@
     if (rField_is_Ring_PtoM(r)) Print("Z/%s^%lu\n", s, r->ringflagb);
     omFreeSize((ADDRESS)s, l);
+*/  
   }
 #endif
@@ -521 +529 @@
   }
 #ifdef HAVE_RINGS
+  TODO(Frank, "Please consider addapting the variable names...");
+/*
   if (r->ringflaga != NULL)
   {
@@ -531 +541 @@
     omFree((ADDRESS)r->nrnModul);
   }
+*/
 #endif
   omFreeBin(r, sip_sring_bin);
@@ -649 +660 @@
 
 #ifdef HAVE_RINGS
+  TODO(Frank, "Please consider addapting the variable names...");
+/*
   if (rField_is_Ring_Z(r))
   {
-    s=omStrDup("integer");                   /* Z */
+    s=omStrDup("integer");                   // Z
     return s;
   }
@@ -674 +687 @@
     return s;
   }
+*/
 #endif
   if (r->parameter==NULL)
@@ -777 +791 @@
 {
 #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);
@@ -784 +800 @@
     return binaryPower((int)mpz_get_ui(r->ringflaga),
                        (int)(unsigned long)r->ringflagb);
+*/
 #endif
   if (rField_is_numeric(r))
@@ -1597 +1614 @@
 ring rCopy0(const ring r, BOOLEAN copy_qideal, BOOLEAN copy_ordering)
 {
+  TODO(Hans, "Please consider the change to '->cf'...");
+  
   if (r == NULL) return NULL;
   int i,j;
@@ -1615 +1634 @@
   res->ch=r->ch;     /* characteristic */
 #ifdef HAVE_RINGS
-  res->ringtype=r->ringtype;  /* cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m */
+  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)
   {
@@ -1627 +1648 @@
     mpz_init_set(res->nrnModul,r->nrnModul);
   }
+*/
 #endif
   //memset: res->ref=0; /* reference counter to the ring */
@@ -1682 +1704 @@
   //memset: res->cf=NULL;
   res->options=r->options;
-  #ifdef HAVE_RINGS
-  res->ringtype=r->ringtype;
-  #endif
+#ifdef HAVE_RINGS
+  TODO(Frank, "Please consider addapting the variable names...");
+//  res->ringtype=r->ringtype;
+#endif
   //
   if (r->algring!=NULL)
@@ -3473 +3496 @@
   // set intStrategy
 #ifdef HAVE_RINGS
-  if (rField_is_Extension(r) || rField_is_Q(r) || rField_is_Ring(r))
+  if (
+         rField_is_Extension(r)
+      || rField_is_Q(r)
+      || rField_is_Ring(r))
 #else
   if (rField_is_Extension(r) || rField_is_Q(r))