Changeset d8a7da in git

Timestamp:

Mar 15, 2013, 1:54:27 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

93e7364ff81efde654648b43b93070f1ff358dfe

Parents:

cd429e3b827c72970f7c3db6b3b3d12f45e000f0

git-author:

Martin Lee <martinlee84@web.de>2013-03-15 13:54:27+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-22 15:52:34+01:00

Message:

chg: added new function to compute bounds wrt different main var

Location:

factory

Files:

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

factory/facFqBivarUtil.cc

@@ -735 +735 @@
 }
 
+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++)
+  {
+    if (i + 1 > maxX || i + 1 < minX)
+    {
+      result [i]= 0;
+      continue;
+    }
+    int* point= new int [2];
+    point [0]= i + 1;
+    point [1]= k;
+    while (!isInPolygon (newtonPolyg, sizeOfNewtonPolygon, point) && k > 0)
+    {
+      k--;
+      point [1]= k;
+    }
+    result [i]= k;
+    k= maxY;
+    delete [] point;
+  }
+
+  return result;
+}
+
 int
 substituteCheck (const CanonicalForm& F, const Variable& x)

factory/facFqBivarUtil.h

@@ -210 +210 @@
               );
 
+/// as above just wrt to the other variable
+///
+/// @return @a computeBounds returns bounds as described above
+int *
+computeBoundsWrtDiffMainvar
+              (const CanonicalForm& F,///< [in] compressed bivariate polynomial
+               int& n,                ///< [in,out] length of output
+               bool& isIrreducible    ///< [in,out] check if poly is irreducible
+              );
+
 /// extract coefficients of \f$ x^i \f$ for \f$i\geq k\f$ where \f$ x \f$ is
 /// a variable of level 1