Changeset 276374 in git

Timestamp:

Dec 16, 2011, 6:34:05 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

0fc4c8bd0177d4673beebe5a386cd69e4161f080f0549c833590080d618d6f7989d1f9c9802da033

Parents:

54e73b123b0a2d72ccfa6b9377b156ff82f854696f6320b9e405525cc39ba4d1e6e22d95e1791065

Message:

Merge pull request #34 from mmklee/factory_without_ntl

fix: issues with building factory without NTL

Files:

• factory/cf_gcd_smallp.cc (modified) (2 diffs)
• factory/facFqFactorize.cc (modified) (2 diffs)
• kernel/kutil.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -1701 +1701 @@
   return A;
 }
+#endif
 
 CFArray
@@ -1736 +1737 @@
 }
 
+#ifdef HAVE_NTL
 CFArray
 evaluateMonom (const CanonicalForm& F, const CFList& evalPoints)

factory/facFqFactorize.cc

@@ -1799 +1799 @@
 }
 
+#endif
+
 static inline
 CanonicalForm prodEval (const CFList& l, const CanonicalForm& evalPoint,
@@ -1871 +1873 @@
 }
 
+#ifdef HAVE_NTL
 void
 factorizationWRTDifferentSecondVars (const CanonicalForm& A, CFList*& Aeval,

kernel/kutil.cc

@@ -6719 +6719 @@
   Print("homog=%d, LazyDegree=%d, LazyPass=%d, ak=%d,\n",
          strat->homog, strat->LazyDegree,strat->LazyPass, strat->ak);
-  Print("honey=%d, sugarCrit=%d, Gebauer=%d, noTailReduction=%d, use_buckets: %d\n",
+  Print("honey=%d, sugarCrit=%d, Gebauer=%d, noTailReduction=%d, use_buckets=%d\n",
          strat->honey,strat->sugarCrit,strat->Gebauer,strat->noTailReduction,strat->use_buckets);
   Print("posInLDependsOnLength=%d, use_buckets=%d\n",
@@ -6752 +6752 @@
     else if (strat->tailRing->pLDeg==maxdegreeWecart) PrintS("maxdegreeWecart");
     else Print("? (%lx)", (long)strat->tailRing->pLDeg);
-    Print(" syzring:%d, syzComp(strat):%d syzComb(ring)\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit(currRing));
+    Print(" syzring:%d, syzComp(strat):%d syzComb:%d limit:%ld\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit(currRing));
     if(TEST_OPT_DEGBOUND)
       Print(" degBound: %d\n", Kstd1_deg);