Changeset 32cc7e in git

Timestamp:

Sep 28, 2011, 5:47:12 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

85fd9012469ea8abe27f4869c1fdec9987b77063

Parents:

aa98be749867c7cb115d6a8245308363068b1c0d

git-author:

Burcin Erocal <burcin@erocal.org>2011-09-28 17:47:12+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:41+01:00

Message:

Implement setting precision of real and complex coefficient domains.

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (2 diffs)
• ffields.cc (modified) (1 diff)
• gnumpc.cc (modified) (4 diffs)
• gnumpc.h (modified) (1 diff)
• gnumpfl.cc (modified) (3 diffs)
• gnumpfl.h (modified) (1 diff)
• longrat.cc (modified) (1 diff)
• numbers.cc (modified) (3 diffs)
• rintegers.cc (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -72 +72 @@
 } GFInfo;
 
+typedef struct
+{
+  short      float_len; /**< additional char-flags, rInit */
+  short      float_len2; /**< additional char-flags, rInit */
+  const char* par_name; /**< parameter name */
+} LongComplexInfo;
 
 struct n_Procs_s
@@ -290 +296 @@
 {
   assume(r!=NULL); // r==NULL is an error
-  if (r->cfSetChar!=NULL) r->cfSetChar(r);
+  assume(r->cfSetChar != NULL);
+  r->cfSetChar(r);
 }
 

libpolys/coeffs/ffields.cc

@@ -762 +762 @@
   //r->cfInitChar=npInitChar;
   //r->cfKillChar=nfKillChar;
-  r->cfSetChar= NULL;
   r->nCoeffIsEqual=nfCoeffIsEqual;
 

libpolys/coeffs/gnumpc.cc

@@ -375 +375 @@
 }
 
-BOOLEAN ngcInitChar(coeffs n, void* p)
+BOOLEAN ngcCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter)
+{
+  if (n==ID) {
+    LongComplexInfo* p = (LongComplexInfo *)(parameter);
+    if (p->float_len == r->float_len && p->float_len2 == r->float_len2 &&
+                    strcmp(p->par_name, r->complex_parameter))
+      return TRUE;
+  }
+  return FALSE;
+}
+
+BOOLEAN ngcInitChar(coeffs n, void* parameter)
 {
   assume( getCoeffType(n) == ID );
+  assume( parameter != NULL);
+
   n->cfKillChar = ndKillChar; /* dummy */
   n->ch = 0;
@@ -411 +424 @@
 #endif
 
-  n->nCoeffIsEqual = ndCoeffIsEqual;
-
+  n->nCoeffIsEqual = ngcCoeffIsEqual;
+
+  n->cfSetChar=ngcSetChar;
 
 
@@ -418 +432 @@
   //r->cfInitChar=nlInitChar;
   r->cfKillChar=NULL;
-  r->cfSetChar=NULL;
-  r->nCoeffIsEqual=nlCoeffsEqual;
 
   r->cfMult  = nlMult;
@@ -477 +489 @@
 */
 
-/// TODO: Any variables?
-  if( p == NULL )
-    n->complex_parameter = omStrDup((char*)"i");
-  else
-    n->complex_parameter = omStrDup( (char*) p );
+  LongComplexInfo* p = (LongComplexInfo*)parameter;
+  n->complex_parameter = omStrDup(p->par_name);
+  n->float_len = p->float_len;
+  n->float_len2 = p->float_len2;
 
   return FALSE;
 }
 
-
+void ngcSetChar(const coeffs r)
+{
+  setGMPFloatDigits(r->float_len, r->float_len2);
+}
 
 

libpolys/coeffs/gnumpc.h

@@ -16 +16 @@
 BOOLEAN ngcInitChar(coeffs r, void*);
 
+void ngcSetChar(const coeffs r);
 
 // Private interface should be hidden!!!

libpolys/coeffs/gnumpfl.cc

@@ -304 +304 @@
 /*2
 * extracts the number a from s, returns the rest
+*
+* This is also called to print components of complex coefficients.
+* Handle with care!
 */
 const char * ngfRead (const char * start, number * a, const coeffs r)
 {
-  assume( getCoeffType(r) == ID );
+  assume( getCoeffType(r) == ID or getCoeffType(r) == n_long_C);
   
   char *s= (char *)start;
@@ -383 +386 @@
 }
 
-BOOLEAN ngfInitChar(coeffs n, void *)
+BOOLEAN ngfCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter)
+{
+  if (n==ID) {
+    LongComplexInfo* p = (LongComplexInfo *)(parameter);
+    if (p->float_len == r->float_len && p->float_len2 == r->float_len2)
+      return TRUE;
+  }
+  return FALSE;
+}
+
+void ngfSetChar(const coeffs r)
+{
+  setGMPFloatDigits(r->float_len, r->float_len2);
+}
+
+BOOLEAN ngfInitChar(coeffs n, void *parameter)
 {
   assume( getCoeffType(n) == ID );
+  assume( parameter != NULL);
+  LongComplexInfo *p = (LongComplexInfo*)parameter;
+
   n->cfKillChar = ndKillChar; /* dummy */
+
+  n->cfSetChar = ngfSetChar;
   n->ch = 0;
   
@@ -416 +439 @@
 #endif
 
-  n->nCoeffIsEqual = ndCoeffIsEqual;
+  n->nCoeffIsEqual = ngfCoeffIsEqual;
+
+  n->float_len = p->float_len;
+  n->float_len2 = p->float_len2;
+
   return FALSE;
 }

libpolys/coeffs/gnumpfl.h

@@ -42 +42 @@
 void     ngfDelete(number *a, const coeffs r);
 
-void setGMPFloatDigits( size_t digits, size_t rest );
 number ngfMapQ(number from, const coeffs r);
 

libpolys/coeffs/longrat.cc

@@ -2602 +2602 @@
 
   r->cfKillChar=NULL;
-  r->cfSetChar=NULL;
   r->nCoeffIsEqual=ndCoeffIsEqual;
   r->cfKillChar = ndKillChar; /* dummy */

libpolys/coeffs/numbers.cc

@@ -116 +116 @@
 }
 void ndKillChar(coeffs) {}
+void ndSetChar(const coeffs) {}
 
 number nd_Copy(number a, const coeffs r) { return n_Copy(a, r); }
@@ -235 +236 @@
 
     //n->cfKillChar = ndKillChar; /* dummy */
+    n->cfSetChar = ndSetChar; /* dummy */
     // temp. removed to catch all the coeffs which miss to implement this!
 
@@ -276 +278 @@
     assume(n->nCoeffIsEqual!=NULL);
     if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
-    if(n->cfSetChar!=NULL) Warn("cfSetChar is NOT NULL for coeff %d",t);
+                assume(n->cfSetChar!=NULL);
     assume(n->cfMult!=NULL);
     assume(n->cfSub!=NULL);

libpolys/coeffs/rintegers.cc

@@ -386 +386 @@
 {
   assume( getCoeffType(r) == ID );
-  r->cfSetChar= NULL;
   r->nCoeffIsEqual = ndCoeffIsEqual;
   r->cfKillChar = ndKillChar;