Changeset 36ef97a in git for factory/facFqBivarUtil.cc

Timestamp:

Feb 28, 2013, 12:27:27 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

f224fda57b6b8846990a1284ec08a294e5b2f0f7

Parents:

160ec65155bebf896fb6d52bbe233c0c557a8c0e

git-author:

Martin Lee <martinlee84@web.de>2013-02-28 12:27:27+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-05-02 11:42:35+02:00

Message:

chg: added absolute irreducibility test

File:

• factory/facFqBivarUtil.cc (modified) (2 diffs)

factory/facFqBivarUtil.cc

@@ -680 +680 @@
 {
   n= degree (F, 1);
+  int* result= new int [n];
+  int sizeOfNewtonPolygon;
+  int** newtonPolyg= newtonPolygon (F, sizeOfNewtonPolygon);
+
+  isIrreducible= false;
+  if (sizeOfNewtonPolygon == 3)
+  {
+    bool check1=
+        (newtonPolyg[0][0]==0 || newtonPolyg[1][0]==0 || newtonPolyg[2][0]==0);
+    if (check1)
+    {
+      bool check2=
+        (newtonPolyg[0][1]==0 || newtonPolyg[1][1]==0 || newtonPolyg[2][0]==0);
+      if (check2)
+      {
+        int p=getCharacteristic();
+        int d=1;
+        char bufGFName='Z';
+        bool GF= (CFFactory::gettype()==GaloisFieldDomain);
+        if (GF)
+        {
+          d= getGFDegree();
+          bufGFName=gf_name;
+        }
+        setCharacteristic(0);
+        CanonicalForm tmp= gcd (newtonPolyg[0][0],newtonPolyg[0][1]);  // maybe it's better to use plain intgcd
+        tmp= gcd (tmp, newtonPolyg[1][0]);
+        tmp= gcd (tmp, newtonPolyg[1][1]);
+        tmp= gcd (tmp, newtonPolyg[2][0]);
+        tmp= gcd (tmp, newtonPolyg[2][1]);
+        isIrreducible= (tmp==1);
+        if (GF)
+          setCharacteristic (p, d, bufGFName);
+        else
+          setCharacteristic(p);
+      }
+    }
+  }
+
+  int minX, minY, maxX, maxY;
+  minX= newtonPolyg [0] [0];
+  minY= newtonPolyg [0] [1];
+  maxX= minX;
+  maxY= minY;
+  for (int i= 1; i < sizeOfNewtonPolygon; i++)
+  {
+    if (minX > newtonPolyg [i] [0])
+      minX= newtonPolyg [i] [0];
+    if (maxX < newtonPolyg [i] [0])
+      maxX= newtonPolyg [i] [0];
+    if (minY > newtonPolyg [i] [1])
+      minY= newtonPolyg [i] [1];
+    if (maxY < newtonPolyg [i] [1])
+      maxY= newtonPolyg [i] [1];
+  }
+
+  int k= maxX;
+  for (int i= 0; i < n; i++)
+  {
+    if (i + 1 > maxY || i + 1 < minY)
+    {
+      result [i]= 0;
+      continue;
+    }
+    int* point= new int [2];
+    point [0]= k;
+    point [1]= i + 1;
+    while (!isInPolygon (newtonPolyg, sizeOfNewtonPolygon, point) && k > 0)
+    {
+      k--;
+      point [0]= k;
+    }
+    result [i]= k;
+    k= maxX;
+    delete [] point;
+  }
+
+  return result;
+}
+
+int *
+computeBoundsWrtDiffMainvar (const CanonicalForm& F, int& n,
+                             bool& isIrreducible)
+{
+  n= degree (F, 2);
   int* result= new int [n];
   int sizeOfNewtonPolygon;
@@ -736 +821 @@
   }
 
-  int k= maxX;
-  for (int i= 0; i < n; i++)
-  {
-    if (i + 1 > maxY || i + 1 < minY)
-    {
-      result [i]= 0;
-      continue;
-    }
-    int* point= new int [2];
-    point [0]= k;
-    point [1]= i + 1;
-    while (!isInPolygon (newtonPolyg, sizeOfNewtonPolygon, point) && k > 0)
-    {
-      k--;
-      point [0]= k;
-    }
-    result [i]= k;
-    k= maxX;
-    delete [] point;
-  }
-
-  return result;
-}
-
-int *
-computeBoundsWrtDiffMainvar (const CanonicalForm& F, int& n,
-                             bool& isIrreducible)
-{
-  n= degree (F, 2);
-  int* result= new int [n];
-  int sizeOfNewtonPolygon;
-  int** newtonPolyg= newtonPolygon (F, sizeOfNewtonPolygon);
-
-  isIrreducible= false;
-  if (sizeOfNewtonPolygon == 3)
-  {
-    bool check1=
-        (newtonPolyg[0][0]==0 || newtonPolyg[1][0]==0 || newtonPolyg[2][0]==0);
-    if (check1)
-    {
-      bool check2=
-        (newtonPolyg[0][1]==0 || newtonPolyg[1][1]==0 || newtonPolyg[2][0]==0);
-      if (check2)
-      {
-        int p=getCharacteristic();
-        int d=1;
-        char bufGFName='Z';
-        bool GF= (CFFactory::gettype()==GaloisFieldDomain);
-        if (GF)
-        {
-          d= getGFDegree();
-          bufGFName=gf_name;
-        }
-        setCharacteristic(0);
-        CanonicalForm tmp= gcd (newtonPolyg[0][0],newtonPolyg[0][1]);
-        tmp= gcd (tmp, newtonPolyg[1][0]);
-        tmp= gcd (tmp, newtonPolyg[1][1]);
-        tmp= gcd (tmp, newtonPolyg[2][0]);
-        tmp= gcd (tmp, newtonPolyg[2][1]);
-        isIrreducible= (tmp==1);
-        if (GF)
-          setCharacteristic (p, d, bufGFName);
-        else
-          setCharacteristic(p);
-      }
-    }
-  }
-
-  int minX, minY, maxX, maxY;
-  minX= newtonPolyg [0] [0];
-  minY= newtonPolyg [0] [1];
-  maxX= minX;
-  maxY= minY;
-  for (int i= 1; i < sizeOfNewtonPolygon; i++)
-  {
-    if (minX > newtonPolyg [i] [0])
-      minX= newtonPolyg [i] [0];
-    if (maxX < newtonPolyg [i] [0])
-      maxX= newtonPolyg [i] [0];
-    if (minY > newtonPolyg [i] [1])
-      minY= newtonPolyg [i] [1];
-    if (maxY < newtonPolyg [i] [1])
-      maxY= newtonPolyg [i] [1];
-  }
-
   int k= maxY;
   for (int i= 0; i < n; i++)