Changeset 3566734 in git

Timestamp:

Nov 20, 2007, 2:42:50 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

dae1edfbb5143f8c4553bf8acd18e2f85b155432

Parents:

62f8cca6dc508c925bc4d657aea450dafba04fb9

Message:

*hannes: ld


git-svn-id: file:///usr/local/Singular/svn/trunk@10431 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• ffreval.cc (modified) (1 diff)
• ffreval.h (modified) (1 diff)

factory/ffreval.cc

@@ -14 +14 @@
 #include "ftmpl_functions.h"
 #include "ffreval.h"
+
+void FFREvaluation::init()
+{
+  int n = values.max();
+
+  for( int i=values.min(); i<=n; i++ )
+    values[i] = offset[i] = gen->generate(); // generate random point
+}
+
+bool FFREvaluation::step()
+{
+  // enumerates the points stored in values
+  int n = values.max();
+  int p = getCharacteristic();
+
+  int i;
+  for(i=values.min(); i<=n; i++ )
+  {
+    if( values[i] != p-1 )
+    {
+      values[i] += 1;
+      break;
+    }
+    values[i] += 1; // becomes 0
+  }
+  for(i=values.min();i<=n;i++)
+  {
+    if(values[i]!=offset[i]) return true;
+  }
+  return false;
+}
+
+FFREvaluation& FFREvaluation::operator= ( const FFREvaluation & e )
+{
+  if( this != &e )
+  {
+    if( gen != 0 )
+      delete gen;
+    values = e.values;
+    offset = e.offset;
+    if( e.gen == 0 )
+      gen = 0;
+    else
+      gen = e.gen->clone();
+  }
+  return *this;
+}    
 
 /* forward declarations:*/

factory/ffreval.h

@@ -21 +21 @@
 };
 
-void FFREvaluation::init()
-{
-  int n = values.max();
-
-  for( int i=values.min(); i<=n; i++ )
-    values[i] = offset[i] = gen->generate(); // generate random point
-}
-
-bool FFREvaluation::step()
-{
-  // enumerates the points stored in values
-  int n = values.max();
-  int p = getCharacteristic();
-
-  int i;
-  for(i=values.min(); i<=n; i++ )
-  {
-    if( values[i] != p-1 )
-    {
-      values[i] += 1;
-      break;
-    }
-    values[i] += 1; // becomes 0
-  }
-  for(i=values.min();i<=n;i++)
-  {
-    if(values[i]!=offset[i]) return true;
-  }
-  return false;
-}
-
-FFREvaluation& FFREvaluation::operator= ( const FFREvaluation & e )
-{
-  if( this != &e )
-  {
-    if( gen != 0 )
-      delete gen;
-    values = e.values;
-    offset = e.offset;
-    if( e.gen == 0 )
-      gen = 0;
-    else
-      gen = e.gen->clone();
-  }
-  return *this;
-}    
-
 CanonicalForm fin_ezgcd ( const CanonicalForm & FF, const CanonicalForm & GG );