Changeset 58c0e4 in git

Timestamp:

Jan 9, 2013, 5:43:52 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9b4920bf5fea321634ffb39fa954b2f172285c58

Parents:

4439f8edfe0644485f10799a19d3a9c37f1a9222

git-author:

Martin Lee <martinlee84@web.de>2013-01-09 17:43:52+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-18 15:00:48+01:00

Message:

chg: added some helper functions

Conflicts:

	factory/facFactorize.cc
	factory/facFqFactorize.cc

Location:

factory

Files:

• facFactorize.cc (modified) (2 diffs)
• facFqFactorize.cc (modified) (3 diffs)
• facFqFactorize.h (modified) (1 diff)

factory/facFactorize.cc

@@ -413 +413 @@
 
   if (w.level() != 1)
-  {
-    A= swapvar (A, y, w);
-    int i= A.level();
-    CanonicalForm evalPoint;
-    for (CFListIterator iter= evaluation; iter.hasItem(); iter++, i--)
-    {
-      if (i == w.level())
-      {
-        evalPoint= iter.getItem();
-        iter.getItem()= evaluation.getLast();
-        evaluation.removeLast();
-        evaluation.append (evalPoint);
-        break;
-      }
-    }
-    for (i= 0; i < lengthAeval2; i++)
-    {
-      if (oldAeval[i].isEmpty())
-        continue;
-      if (oldAeval[i].getFirst().level() == w.level())
-      {
-        CFArray tmp= copy (oldAeval[i]);
-        oldAeval[i]= biFactors; 
-        for (CFListIterator iter= oldAeval[i]; iter.hasItem(); iter++)
-          iter.getItem()= swapvar (iter.getItem(), w, y);
-        for (int ii= 0; ii < tmp.size(); ii++)
-          tmp[ii]= swapvar (tmp[ii], w, y);
-        CFArray tmp2= CFArray (tmp.size());
-        CanonicalForm buf;
-        for (int ii= 0; ii < tmp.size(); ii++)
-        {
-          buf= tmp[ii] (evaluation.getLast(),y);
-          buf /= Lc (buf);
-          tmp2[findItem (uniFactors, buf)-1]=tmp[ii];
-        }
-        biFactors= CFList();
-        for (int j= 0; j < tmp2.size(); j++)
-          biFactors.append (tmp2[j]);
-      }
-    }
-  }
-
-  CFListIterator iter;
+    changeSecondVariable (A, biFactors, evaluation, oldAeval, lengthAeval2, uniFactors, w);
+
   CanonicalForm oldA= A;
   CFList oldBiFactors= biFactors;
-  if (!leadingCoeffs.getFirst().inCoeffDomain())
-  {
-    CanonicalForm tmp= power (leadingCoeffs.getFirst(), biFactors.length() - 1);
-    A *= tmp;
-    tmp= leadingCoeffs.getFirst();
-    iter= leadingCoeffs;
-    iter++;
-    for (;iter.hasItem(); iter++)
-      iter.getItem() *= tmp;
-    iter= evaluation;
-    for (int i= A.level(); i > 2; i--, iter++)
-      tmp= tmp (iter.getItem(), i);
-    if (!tmp.inCoeffDomain())
-    {
-      for (CFListIterator i= biFactors; i.hasItem(); i++)
-      {
-        i.getItem() *= tmp/LC (i.getItem(), 1);
-        i.getItem() /= Lc (i.getItem());
-      }
-    }
-  }
 
   CanonicalForm LCmultiplier= leadingCoeffs.getFirst();
   bool LCmultiplierIsConst= LCmultiplier.inCoeffDomain();
   leadingCoeffs.removeFirst();
+
+  if (!LCmultiplierIsConst)
+    distributeLCmultiplier (A, leadingCoeffs, biFactors, evaluation, LCmultiplier);
 
   //prepare leading coefficients
@@ -489 +430 @@
                         evaluation);
 
+  CFListIterator iter;
 
   Aeval= evaluateAtEval (A, evaluation, 2);

factory/facFqFactorize.cc

@@ -2344 +2344 @@
 }
 
+void changeSecondVariable (CanonicalForm& A, CFList& biFactors, CFList& evaluation, CFList*& oldAeval, int lengthAeval2, const CFList& uniFactors, const Variable& w)
+{
+  Variable y= Variable (2);
+  A= swapvar (A, y, w);
+  int i= A.level();
+  CanonicalForm evalPoint;
+  for (CFListIterator iter= evaluation; iter.hasItem(); iter++, i--)
+  {
+    if (i == w.level())
+    {
+      evalPoint= iter.getItem();
+      iter.getItem()= evaluation.getLast();
+      evaluation.removeLast();
+      evaluation.append (evalPoint);
+      break;
+    }
+  }
+  for (i= 0; i < lengthAeval2; i++)
+  {
+    if (oldAeval[i].isEmpty())
+      continue;
+    if (oldAeval[i].getFirst().level() == w.level())
+    {
+      CFArray tmp= copy (oldAeval[i]);
+      oldAeval[i]= biFactors;
+      for (CFListIterator iter= oldAeval[i]; iter.hasItem(); iter++)
+        iter.getItem()= swapvar (iter.getItem(), w, y);
+      for (int ii= 0; ii < tmp.size(); ii++)
+        tmp[ii]= swapvar (tmp[ii], w, y);
+      CFArray tmp2= CFArray (tmp.size());
+      CanonicalForm buf;
+      for (int ii= 0; ii < tmp.size(); ii++)
+      {
+        buf= tmp[ii] (evaluation.getLast(),y);
+        buf /= Lc (buf);
+        tmp2[findItem (uniFactors, buf)-1]=tmp[ii];
+      }
+      biFactors= CFList();
+      for (int j= 0; j < tmp2.size(); j++)
+        biFactors.append (tmp2[j]);
+    }
+  }
+}
+
+void distributeLCmultiplier (CanonicalForm& A, CFList& leadingCoeffs, CFList& biFactors, const CFList& evaluation, const CanonicalForm& LCmultipler)
+{
+  CanonicalForm tmp= power (LCmultipler, biFactors.length() - 1);
+  A *= tmp;
+  tmp= LCmultipler;
+  CFListIterator iter= leadingCoeffs;
+  for (;iter.hasItem(); iter++)
+    iter.getItem() *= LCmultipler;
+  iter= evaluation;
+  for (int i= A.level(); i > 2; i--, iter++)
+    tmp= tmp (iter.getItem(), i);
+  if (!tmp.inCoeffDomain())
+  {
+    for (CFListIterator i= biFactors; i.hasItem(); i++)
+    {
+      i.getItem() *= tmp/LC (i.getItem(), 1);
+      i.getItem() /= Lc (i.getItem());
+    }
+  }
+}
+
 CFList
 extFactorize (const CanonicalForm& F, const ExtensionInfo& info);
@@ -2718 +2783 @@
 
   if (v.level() != 1)
-  {
-    A= swapvar (A, y, v);
-    int i= A.level();
-    CanonicalForm evalPoint;
-    for (CFListIterator iter= evaluation; iter.hasItem(); iter++, i--)
-    {
-      if (i == v.level())
-      {
-        evalPoint= iter.getItem();
-        iter.getItem()= evaluation.getLast();
-        evaluation.removeLast();
-        evaluation.append (evalPoint);
-        break;
-      }
-    }
-    for (i= 0; i < lengthAeval2; i++)
-    {
-      if (oldAeval[i].isEmpty())
-        continue;
-      if (oldAeval[i].getFirst().level() == v.level())
-      {
-        CFArray tmp= copy (oldAeval[i]);
-        oldAeval[i]= biFactors;
-        for (CFListIterator iter= oldAeval[i]; iter.hasItem(); iter++)
-          iter.getItem()= swapvar (iter.getItem(), v, y);
-        for (int ii= 0; ii < tmp.size(); ii++)
-          tmp[ii]= swapvar (tmp[ii], v, y);
-        CFArray tmp2= CFArray (tmp.size());
-        CanonicalForm buf;
-        for (int ii= 0; ii < tmp.size(); ii++)
-        {
-          buf= tmp[ii] (evaluation.getLast(),y);
-          buf /= Lc (buf);
-          tmp2[findItem (uniFactors, buf)-1]=tmp[ii];
-        }
-        biFactors= CFList();
-        for (int j= 0; j < tmp2.size(); j++)
-          biFactors.append (tmp2[j]);
-      }
-    }
-  }
-
-  CFListIterator iter;
+    changeSecondVariable (A, biFactors, evaluation, oldAeval, lengthAeval2, uniFactors, v);
+
   CanonicalForm oldA= A;
   CFList oldBiFactors= biFactors;
-  if (!leadingCoeffs.getFirst().inCoeffDomain())
-  {
-    CanonicalForm tmp= power (leadingCoeffs.getFirst(), biFactors.length() - 1);
-    A *= tmp;
-    tmp= leadingCoeffs.getFirst();
-    iter= leadingCoeffs;
-    iter++;
-    for (;iter.hasItem(); iter++)
-      iter.getItem() *= tmp;
-    iter= evaluation;
-    for (int i= A.level(); i > 2; i--, iter++)
-      tmp= tmp (iter.getItem(), i);
-    if (!tmp.inCoeffDomain())
-    {
-      for (CFListIterator i= biFactors; i.hasItem(); i++)
-      {
-        i.getItem() *= tmp/LC (i.getItem(), 1);
-        i.getItem() /= Lc (i.getItem());
-      }
-    }
-  }
 
   CanonicalForm LCmultiplier= leadingCoeffs.getFirst();
   bool LCmultiplierIsConst= LCmultiplier.inCoeffDomain();
   leadingCoeffs.removeFirst();
+
+  if (!LCmultiplierIsConst)
+    distributeLCmultiplier (A, leadingCoeffs, biFactors, evaluation, LCmultiplier);
 
   //prepare leading coefficients
@@ -2794 +2800 @@
                         evaluation);
 
+  CFListIterator iter;
   Aeval= evaluateAtEval (A, evaluation, 2);
   CanonicalForm hh= 1/Lc (Aeval.getFirst());

factory/facFqFactorize.h

@@ -684 +684 @@
                        );
 
+void changeSecondVariable (CanonicalForm& A, CFList& biFactors, CFList& evaluation, CFList*& oldAeval, int lengthAeval2, const CFList& uniFactors, const Variable& w);
+void distributeLCmultiplier (CanonicalForm& A, CFList& leadingCoeffs, CFList& biFactors, const CFList& evaluation, const CanonicalForm& LCmultipler);
+
 #endif
 /* FAC_FQ_FACTORIZE_H */