Changeset e2c9b2 in git

Timestamp:

May 23, 2013, 11:53:05 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

34636b48632d13ac0387fd040ea2249787e2b993eb3abbb7345bcf75de0d0de288aeeba59f8c3985

Parents:

29c097eaf94a727ace4d3a536c13c21fd399f40a

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-05-23 11:53:05+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-05-23 11:53:21+02:00

Message:

fix: avoid omSizeWOfAddr

File:

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

libpolys/polys/monomials/ring.cc

@@ -244 +244 @@
   const coeffs C = r->cf;
   assume(C != NULL);
-  
+
   int nblocks=rBlocks(r);
 
@@ -267 +267 @@
 
     n_CoeffWrite(C, details); // for correct printing of minpoly... WHAT AN UGLYNESS!!!
-    
+
     R->ShortOut = bSaveShortOut;
   }
@@ -274 +274 @@
 //   {
 //     PrintS("//   characteristic : ");
-//     
+//
 //     char const * const * const params = rParameter(r);
-//     
+//
 //     if (params!=NULL)
 //     {
 //       Print ("//   %d parameter    : ",rPar(r));
-//       
+//
 //       char const * const * sp= params;
 //       int nop=0;
@@ -301 +301 @@
 //       else
 //       {
-//         StringSetS(""); n_Write(r->cf->minpoly, r); PrintS(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s); 
+//         StringSetS(""); n_Write(r->cf->minpoly, r); PrintS(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s);
 //       }
 //       //if (r->qideal!=NULL)
@@ -1690 +1690 @@
   assume( r1->cf == r2->cf );
   assume( rVar(r1) == rVar(r2) );
-  
+
   for (i=0; i<rVar(r1); i++)
   {
@@ -2123 +2123 @@
   assume(r != NULL);
   assume(r->cf != NULL);
-  
+
   if (nCoeff_is_algExt(r->cf))
   {
@@ -2220 +2220 @@
 {
   assume(weights != NULL);
-  
+
   // weighted degree (aligned) of variables v_start..v_end, ordsgn 1
 //  while((start<end) && (weights[0]==0)) { start++; weights++; }
@@ -3048 +3048 @@
       // are introduced, but their names are never set
       // hence, we do the following awkward trick
-      int N = omSizeWOfAddr(r->names);
+      int N = omSizeOfAddr(r->names)/sizeof(char*);
       if (r->N < N) N = r->N;
 
@@ -4039 +4039 @@
       Print("  VarL_Offset[%d]: %d ", j, r->VarL_Offset[j]);
   PrintLn();
-      
+
 
   PrintS("VarOffset:\n");
@@ -5674 +5674 @@
 
   Werror("n_IsParam: IsParam is not to be used for (coeff_type = %d)",getCoeffType(C));
-  
+
   return 0;
 }