Changeset dc06550 in git

Timestamp:

Aug 26, 2010, 6:05:47 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

17e58bd0adfff2102c82ae041746b1ff6830733c

Parents:

93add9a784df847a6a6929657ab54c3415b5d2d7

git-author:

Martin Lee <martinlee84@web.de>2010-08-26 18:05:47+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:27+01:00

Message:

GF passes tests

Location:

coeffs

Files:

• coeffs.h (modified) (1 diff)
• ffields.cc (modified) (5 diffs)
• ffields.h (modified) (1 diff)
• test.cc (modified) (6 diffs)

coeffs/coeffs.h

@@ -211 +211 @@
   unsigned short *m_nfPlus1Table;
   int *m_nfMinPoly;
+  char * m_nfParameter;
 };
 //

coeffs/ffields.cc

@@ -414 +414 @@
   else
   {
-    StringAppendS(r->parameter[0]);
+    StringAppendS(r->m_nfParameter);
     if ((long)a!=1L)
     {
@@ -432 +432 @@
 #endif
   char *s;
-  char *nfParameter=r->parameter[0];
+  char *nfParameter=r->m_nfParameter;
   if (((long)a==(long)r->m_nfCharQ) || ((long)a==0L)) return NULL;
   else if ((long)a==1L)
@@ -512 +512 @@
     *a = nfDiv(z,n,r);
   }
-  char *nfParameter=r->parameter[0];
+  char *nfParameter=r->m_nfParameter;
   if (strncmp(s,nfParameter,strlen(nfParameter))==0)
   {
@@ -572 +572 @@
     j++;
     if (nfMinPoly[j]!=0)
-      StringAppend("%d*%s^%d",nfMinPoly[j],r->parameter[0],i);
+      StringAppend("%d*%s^%d",nfMinPoly[j],r->m_nfParameter,i);
     i--;
     if(i<0) break;
@@ -828 +828 @@
   assume( r->type == n_GF );
 
-
+  GFInfo* p = (GFInfo *)(parameter); 
+  const char * name = p->GFPar_name;
   r->m_nfCharQ = 0;
- 
+  r->m_nfCharP = p->GFChar;
+  r->m_nfCharQ1 = 0;
+  r->m_nfParameter= strdup(name); //TODO use omAlloc for allocating memory and use strcpy?
+  r->m_nfPlus1Table= NULL;
 
   r->has_simple_Alloc=TRUE;
   r->has_simple_Inverse=TRUE;
-  const int c = (int)(long)(parameter);
+  const int c = p->GFSize;
   nfReadTable(c, r);
   r->ch = r->m_nfCharP; 

coeffs/ffields.h

@@ -11 +11 @@
 
 // #define MAX_INT_VAL 0x7fffffff
+typedef struct 
+{
+  int GFChar;
+  int GFSize;
+  char* GFPar_name;
+} GFInfo;
+
 
 void nfInitChar(coeffs r, void*);

coeffs/test.cc

@@ -25 +25 @@
 bool Test(const coeffs r)
 {
-  number a = n_Init(666, r); 
-  
+  number a = n_Init(666, r);
+   
   StringSetS("a: ");
   n_Test(a,r);
@@ -39 +39 @@
   PrintS(StringAppend("\n"));
 
-
+  if (getCoeffType(r) == n_GF) //some special test for GF
+  {
+    number z= nfPar (2, r);
+    StringSetS("z: ");
+    n_Test(z,r); n_Write (z,r);
+    PrintS(StringAppend("\n"));
+  }
+  
   number aa = n_Add(a, a, r);
 
@@ -125 +132 @@
 
   nSetChar( r );
-
   assume( getCoeffType(r) == type );
 
@@ -133 +139 @@
   assume( r->cfDelete != NULL );
 
-
   if( type == n_Q )
   {
@@ -177 +182 @@
     assume( r->cfDelete == nrnDelete );
   }
-#endif  
+#endif
+  else if( type == n_GF )
+  {
+    assume( r->cfInit == nfInit );
+    assume( r->cfWrite == nfWrite );
+    assume( r->cfAdd == nfAdd );
+    //assume( r->cfDelete == nfDelete );
+  }
   else
   {
@@ -231 +243 @@
   // TODO: Oleksandr/Martin
    type = nRegister( n_GF, nfInitChar); assume( type == n_GF );
-   if( Test(type) )
+   GFInfo param;
+
+   param.GFChar= 5;
+   param.GFSize= 25;
+   param.GFPar_name= "Z";
+   if( Test(type, (void*) &param) )
      c ++;