Changeset ce1f78 in git for libpolys/coeffs

Timestamp:

Mar 16, 2012, 8:22:15 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7fee87629a807b6be566a7757b3b60f36c22d651

Parents:

cd9796d49b820bd9ecc81b49dc04073e0bbf6012

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 20:22:15+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 21:36:33+01:00

Message:

fixed short/long output of coeffs depending on ShortOut/CanShortOut options of rings

Note: the ugly ShortOut correction p_String0Short/p_String0Long is due to Hans

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (3 diffs)
• ffields.cc (modified) (4 diffs)
• gnumpc.cc (modified) (2 diffs)
• gnumpfl.cc (modified) (1 diff)
• longrat.cc (modified) (1 diff)
• modulop.cc (modified) (1 diff)
• numbers.cc (modified) (2 diffs)
• numbers.h (modified) (1 diff)
• rintegers.cc (modified) (1 diff)
• rmodulo2m.cc (modified) (1 diff)
• rmodulon.cc (modified) (1 diff)
• shortfl.cc (modified) (1 diff)
• test.cc (modified) (8 diffs)

libpolys/coeffs/coeffs.h

@@ -145 +145 @@
    number  (*cfRePart)(number a, const coeffs r);
    number  (*cfImPart)(number a, const coeffs r);
-   void    (*cfWrite)(number &a, const coeffs r);
+
+   /// print a given number (long format)
+   void    (*cfWriteLong)(number &a, const coeffs r);
+   
+   /// print a given number in a shorter way, if possible
+   /// e.g. in K(a): a2 instead of a^2
+   void    (*cfWriteShort)(number &a, const coeffs r);
+   
    const char *  (*cfRead)(const char * s, number * a, const coeffs r);
    void    (*cfNormalize)(number &a, const coeffs r);
@@ -262 +269 @@
   short      float_len2; /* additional char-flags, rInit */
 
-  BOOLEAN   CanShortOut; //< if the elements can be printed in short format
-                       // this is set to FALSE if a parameter name has >2 chars
-  BOOLEAN   ShortOut; //< if the elements should print in short format
+//  BOOLEAN   CanShortOut; //< if the elements can be printed in short format
+//                     // this is set to FALSE if a parameter name has >2 chars
+//  BOOLEAN   ShortOut; //< if the elements should print in short format
 
 // ---------------------------------------------------
@@ -449 +456 @@
 
 /// write to the output buffer of the currently used reporter
-static inline void   n_Write(number& n,  const coeffs r)
-{ assume(r != NULL); assume(r->cfWrite!=NULL); r->cfWrite(n,r); }
+static inline void   n_WriteLong(number& n,  const coeffs r)
+{ assume(r != NULL); assume(r->cfWriteLong!=NULL); r->cfWriteLong(n,r); }
+
+/// write to the output buffer of the currently used reporter
+/// in a shortest possible way, e.g. in K(a): a2 instead of a^2
+static inline void   n_WriteShort(number& n,  const coeffs r)
+{ assume(r != NULL); assume(r->cfWriteShort!=NULL); r->cfWriteShort(n,r); }
+
+static inline void   n_Write(number& n,  const coeffs r, const BOOLEAN bShortOut = TRUE)
+{ if (bShortOut) n_WriteShort(n, r); else n_WriteLong(n, r); }
+
 
 /// @todo: Describe me!!! --> Hans

libpolys/coeffs/ffields.cc

@@ -384 +384 @@
 * write via StringAppend
 */
-void nfWrite (number &a, const coeffs r)
+static void nfWriteLong (number &a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -397 +397 @@
     if ((long)a!=1L)
     {
-      if(r->ShortOut==0)  StringAppendS("^");
+      StringAppend("^%d",(int)((long)a)); // long output!
+    }
+  }
+}
+
+
+/*2
+* write (shortert output) via StringAppend
+*/
+static void nfWriteShort (number &a, const coeffs r)
+{
+#ifdef LDEBUG
+  nfTest(a, r);
+#endif
+  if ((long)a==(long)r->m_nfCharQ)  StringAppendS("0");
+  else if ((long)a==0L)   StringAppendS("1");
+  else if (nfIsMOne(a, r))   StringAppendS("-1");
+  else
+  {
+    StringAppendS(r->m_nfParameter);
+    if ((long)a!=1L)
+    {
       StringAppend("%d",(int)((long)a));
     }
@@ -786 +807 @@
   //r->cfRePart = ndCopy;
   //r->cfImPart = ndReturn0;
-  r->cfWrite = nfWrite;
+  
+  r->cfWriteLong = nfWriteLong;
+  
   r->cfRead = nfRead;
   //r->cfNormalize=ndNormalize;
@@ -824 +847 @@
   r->m_nfPlus1Table= NULL;
 
-  if (strlen(name) > 1) {
-    r->ShortOut = 0;
-    r->CanShortOut = FALSE;
-  } else {
-    r->ShortOut = 1;
-  }
+  if (strlen(name) > 1)
+    r->cfWriteShort = nfWriteLong;
+  else
+    r->cfWriteShort = nfWriteShort;
 
   r->has_simple_Alloc=TRUE;

libpolys/coeffs/gnumpc.cc

@@ -416 +416 @@
   n->cfIsMOne  = ngcIsMOne;
   n->cfGreaterZero = ngcGreaterZero;
-  n->cfWrite  = ngcWrite;
+
+  n->cfWriteLong  = ngcWrite;
+  n->cfWriteShort = ngcWrite;
+  
   n->cfRead    = ngcRead;
   n->cfPower   = ngcPower;
@@ -459 +462 @@
   r->cfRePart = nl_Copy;
   r->cfImPart = ndReturn0;
-  r->cfWrite = nlWrite;
+  r->cfWriteLong = nlWrite;
   r->cfRead = nlRead;
   r->cfNormalize=nlNormalize;

libpolys/coeffs/gnumpfl.cc

@@ -428 +428 @@
   n->cfIsMOne  = ngfIsMOne;
   n->cfGreaterZero = ngfGreaterZero;
-  n->cfWrite  = ngfWrite;
+  n->cfWriteLong  = ngfWrite;
   n->cfRead    = ngfRead;
   n->cfPower   = ngfPower;

libpolys/coeffs/longrat.cc

@@ -2675 +2675 @@
   r->cfRePart = nlCopy;
   //r->cfImPart = ndReturn0;
-  r->cfWrite = nlWrite;
+  r->cfWriteLong = nlWrite;
   r->cfRead = nlRead;
   r->cfNormalize=nlNormalize;

libpolys/coeffs/modulop.cc

@@ -468 +468 @@
   //r->cfRePart = ndCopy;
   //r->cfImPart = ndReturn0;
-  r->cfWrite = npWrite;
+  r->cfWriteLong = npWrite;
   r->cfRead = npRead;
   //r->cfNormalize=ndNormalize;

libpolys/coeffs/numbers.cc

@@ -291 +291 @@
     if (n->cfGetUnit==NULL) n->cfGetUnit=n->cfCopy;
 #endif
-   
+
+    if(n->cfWriteShort==NULL)
+      n->cfWriteShort = n->cfWriteLong;
+    
 #ifndef NDEBUG
     assume(n->nCoeffIsEqual!=NULL);
@@ -316 +319 @@
     assume(n->cfRePart!=NULL);
     assume(n->cfImPart!=NULL);
-    assume(n->cfWrite!=NULL);
+
+    assume(n->cfWriteLong!=NULL);
+    assume(n->cfWriteShort!=NULL);
+
+
+    if(n->cfWriteLong==NULL) Warn("cfWrite is NULL for coeff %d",t);
+    if(n->cfWriteShort==NULL) Warn("cfWriteShort is NULL for coeff %d",t);
+    
     assume(n->cfRead!=NULL);
     assume(n->cfNormalize!=NULL);

libpolys/coeffs/numbers.h

@@ -27 +27 @@
 #define nIsMOne(n)        n_IsMOne(n, currRing->cf)
 #define nGreaterZero(n)   n_GreaterZero(n, currRing->cf)
-#define nGreater(a, b)   n_Greater (a,b,currRing->cf)
-#define nWrite(n)         n_Write(n,currRing->cf)
+#define nGreater(a, b)    n_Greater (a,b,currRing->cf)
+#define nWrite(n)         n_Write(n, currRing->cf, rShortOut(currRing))
 #define nNormalize(n)     n_Normalize(n,currRing->cf)
 

libpolys/coeffs/rintegers.cc

@@ -408 +408 @@
   r->cfInvers= nrzInvers;
   r->cfCopy  = nrzCopy;
-  r->cfWrite = nrzWrite;
+  r->cfWriteLong = nrzWrite;
   r->cfRead = nrzRead;
   r->cfGreater = nrzGreater;

libpolys/coeffs/rmodulo2m.cc

@@ -77 +77 @@
   r->cfIsMOne      = nr2mIsMOne;
   r->cfGreaterZero = nr2mGreaterZero;
-  r->cfWrite       = nr2mWrite;
+  r->cfWriteLong       = nr2mWrite;
   r->cfRead        = nr2mRead;
   r->cfPower       = nr2mPower;

libpolys/coeffs/rmodulon.cc

@@ -78 +78 @@
   r->cfIsMOne      = nrnIsMOne;
   r->cfGreaterZero = nrnGreaterZero;
-  r->cfWrite       = nrnWrite;
+  r->cfWriteLong       = nrnWrite;
   r->cfRead        = nrnRead;
   r->cfPower       = nrnPower;

libpolys/coeffs/shortfl.cc

@@ -567 +567 @@
   n->cfIsMOne = nrIsMOne;
   n->cfGreaterZero = nrGreaterZero;
-  n->cfWrite = nrWrite;
+  n->cfWriteLong = nrWrite;
   n->cfRead = nrRead;
   n->cfPower = nrPower;

libpolys/coeffs/test.cc

@@ -196 +196 @@
 
   assume( r->cfInit != NULL );
-  assume( r->cfWrite != NULL );
+  assume( r->cfWriteLong != NULL );
   assume( r->cfAdd != NULL );
   assume( r->cfDelete != NULL );
@@ -203 +203 @@
   {
     assume( r->cfInit == nlInit );
-    assume( r->cfWrite == nlWrite );
     assume( r->cfAdd == nlAdd );
     assume( r->cfDelete == nlDelete );    
@@ -210 +209 @@
   {
     assume( r->cfInit == ngfInit );
-    assume( r->cfWrite == ngfWrite );
     assume( r->cfAdd == ngfAdd );
     assume( r->cfDelete == ngfDelete );
@@ -217 +215 @@
   {
     assume( r->cfInit == ngcInit );
-    assume( r->cfWrite == ngcWrite );
     assume( r->cfAdd == ngcAdd );
     assume( r->cfDelete == ngcDelete );    
@@ -224 +221 @@
   {
     assume( r->cfInit == nrInit );
-    assume( r->cfWrite == nrWrite );
     assume( r->cfAdd == nrAdd );
 //    assume( r->cfDelete == nrDelete ); // No?
@@ -232 +228 @@
   {
     assume( r->cfInit == nr2mInit );
-    assume( r->cfWrite == nr2mWrite );
     assume( r->cfAdd == nr2mAdd );
     assume( r->cfDelete == ndDelete );
@@ -239 +234 @@
   {
     assume( r->cfInit == nrnInit );
-    assume( r->cfWrite == nrnWrite );
     assume( r->cfAdd == nrnAdd );
     assume( r->cfDelete == nrnDelete );
@@ -247 +241 @@
   {
     assume( r->cfInit == nfInit );
-    assume( r->cfWrite == nfWrite );
     assume( r->cfAdd == nfAdd );
     //assume( r->cfDelete == nfDelete );