Changeset 733d24 in git

Timestamp:

Sep 28, 2011, 7:33:12 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9310cbb099615137456c0252eaee33a50d9db993

Parents:

046a941e1caf6571a05abbcd7e9dc58a903aa4eb

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-28 19:33:12+02:00

git-committer:

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

Message:

FIX: default construction parameters for real/complex number fields

Location:

libpolys/coeffs

Files:

• gnumpc.cc (modified) (2 diffs)
• gnumpfl.cc (modified) (2 diffs)
• shortfl.cc (modified) (2 diffs)

libpolys/coeffs/gnumpc.cc

@@ -389 +389 @@
 {
   assume( getCoeffType(n) == ID );
-  assume( parameter != NULL);
 
   n->cfKillChar = ndKillChar; /* dummy */
@@ -488 +487 @@
   r->has_simple_Inverse=FALSE;
 */
-
-  LongComplexInfo* p = (LongComplexInfo*)parameter;
-  n->complex_parameter = omStrDup(p->par_name);
-  n->float_len = p->float_len;
-  n->float_len2 = p->float_len2;
+   
+  if( parameter != NULL)
+  {
+    LongComplexInfo* p = (LongComplexInfo*)parameter;
+    n->complex_parameter = omStrDup(p->par_name);
+    n->float_len = p->float_len;
+    n->float_len2 = p->float_len2;
+    
+  } else // default values, just for testing!
+  {
+    n->complex_parameter = omStrDup("i");
+    n->float_len = SHORT_REAL_LENGTH;
+    n->float_len2 = SHORT_REAL_LENGTH;     
+  }
+   
+  assume( n->float_len <= n->float_len2 );
+  assume( n->float_len2 >= SHORT_REAL_LENGTH );
+  assume( n->complex_parameter != NULL );
 
   return FALSE;

libpolys/coeffs/gnumpfl.cc

@@ -404 +404 @@
 {
   assume( getCoeffType(n) == ID );
-  assume( parameter != NULL);
-  LongComplexInfo *p = (LongComplexInfo*)parameter;
 
   n->cfKillChar = ndKillChar; /* dummy */
@@ -441 +439 @@
   n->nCoeffIsEqual = ngfCoeffIsEqual;
 
-  n->float_len = p->float_len;
-  n->float_len2 = p->float_len2;
+  if( parameter != NULL)
+  {
+    LongComplexInfo* p = (LongComplexInfo*)parameter;
+     
+    n->float_len = p->float_len;
+    n->float_len2 = p->float_len2;
+  } else // default values, just for testing!
+  {
+    n->float_len = SHORT_REAL_LENGTH;
+    n->float_len2 = SHORT_REAL_LENGTH;
+  }
+   
+  assume( n->float_len <= n->float_len2 );
+  assume( n->float_len2 >= SHORT_REAL_LENGTH );
+  assume( n->complex_parameter == NULL );
 
   return FALSE;

libpolys/coeffs/shortfl.cc

@@ -542 +542 @@
 }
 
-BOOLEAN nrInitChar(coeffs n, void*)
+BOOLEAN nrInitChar(coeffs n, void* p)
 {
   assume( getCoeffType(n) == ID );
+   
+  assume( p == NULL ); p;
+   
   n->cfKillChar = ndKillChar; /* dummy */
   n->ch = 0;
@@ -578 +581 @@
   n->nCoeffIsEqual = ndCoeffIsEqual;
 
+  n->float_len = SHORT_REAL_LENGTH;
+  n->float_len2 = SHORT_REAL_LENGTH;
+   
   // TODO: Any variables?
   return FALSE;