Changeset 8336c9 in git for factory/facFqFactorize.cc

Timestamp:

Aug 15, 2012, 4:47:03 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

5b390eae2a5015d099e164e415bf9de0df375fd5

Parents:

c7b56e2b570482a60737ec1d6e4bf209156c36fa

git-author:

Martin Lee <martinlee84@web.de>2012-08-15 16:47:03+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-04 18:01:18+02:00

Message:

chg: moved some helper functions to utilities

File:

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

factory/facFqFactorize.cc

@@ -1278 +1278 @@
 }
 
-CFList evaluateAtZero (const CanonicalForm& F)
-{
-  CFList result;
-  CanonicalForm buf= F;
-  result.insert (buf);
-  for (int i= F.level(); i > 2; i--)
-  {
-    buf= buf (0, i);
-    result.insert (buf);
-  }
-  return result;
-}
-
-CFList evaluateAtEval (const CanonicalForm& F, const CFArray& eval)
-{
-  CFList result;
-  CanonicalForm buf= F;
-  result.insert (buf);
-  int k= eval.size();
-  for (int i= 1; i < k; i++)
-  {
-    buf= buf (eval[i], i + 2);
-    result.insert (buf);
-  }
-  return result;
-}
-
-CFList evaluateAtEval (const CanonicalForm& F, const CFList& evaluation, int l)
-{
-  CFList result;
-  CanonicalForm buf= F;
-  result.insert (buf);
-  int k= evaluation.length() + l - 1;
-  CFListIterator j= evaluation;
-  for (int i= k; j.hasItem() && i > l; i--, j++)
-  {
-    if (F.level() < i)
-      continue;
-    buf= buf (j.getItem(), i);
-    result.insert (buf);
-  }
-  return result;
-}
-
 int
 testFactors (const CanonicalForm& G, const CFList& uniFactors,
@@ -2072 +2028 @@
       j.getItem() *= ii.getItem();
   }
-}
-
-CFList recoverFactors (const CanonicalForm& F, const CFList& factors)
-{
-  CFList result;
-  CanonicalForm tmp, tmp2;
-  CanonicalForm G= F;
-  for (CFListIterator i= factors; i.hasItem(); i++)
-  {
-    tmp= i.getItem()/content (i.getItem(), 1);
-    if (fdivides (tmp, G, tmp2))
-    {
-      G= tmp2;
-      result.append (tmp);
-    }
-  }
-  return result;
-}
-
-CFList recoverFactors (const CanonicalForm& F, const CFList& factors,
-                       const CFList& evaluation)
-{
-  CFList result;
-  CanonicalForm tmp, tmp2;
-  CanonicalForm G= F;
-  for (CFListIterator i= factors; i.hasItem(); i++)
-  {
-    tmp= reverseShift (i.getItem(), evaluation);
-    tmp /= content (tmp, 1);
-    if (fdivides (tmp, G, tmp2))
-    {
-      G= tmp2;
-      result.append (tmp);
-    }
-  }
-  return result;
-}
-
-CFList recoverFactors (CanonicalForm& F, const CFList& factors, int* index)
-{
-  CFList result;
-  CanonicalForm tmp, tmp2;
-  CanonicalForm G= F;
-  int j= 0;
-  for (CFListIterator i= factors; i.hasItem(); i++, j++)
-  {
-    if (i.getItem().isZero())
-    {
-      index[j]= 0;
-      continue;
-    }
-    tmp= i.getItem();
-    if (fdivides (tmp, G, tmp2))
-    {
-      G= tmp2;
-      tmp /=content (tmp, 1);
-      result.append (tmp);
-      index[j]= 1;
-    }
-    else
-      index[j]= 0;
-  }
-  F= G;
-  return result;
 }