Changeset 85d7d3 in git for kernel/GBEngine/kutil.h

Timestamp:

Aug 22, 2018, 4:12:13 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

0b5677c6b2f8865b896a99cadd2973168d436443

Parents:

88f386c1a3dd3a46dae409cb905b4255a81f913ab4976474e098cd507f0f7546f91de0121097e7d0

Message:

Merge branch 'spielwiese' into letterplace_kernel_multiplication

File:

• kernel/GBEngine/kutil.h (modified) (6 diffs)

kernel/GBEngine/kutil.h

@@ -11 +11 @@
 #include <string.h>
 
+#ifdef HAVE_OMALLOC
 #include "omalloc/omalloc.h"
-#ifndef XMEMORY_H
 #include "omalloc/omallocClass.h"
-#endif
+#else
+#include "xalloc/omalloc.h"
+#endif
+
 #include "misc/mylimits.h"
-
 
 #include "kernel/polys.h"
@@ -264 +266 @@
 
 class skStrategy
-#ifndef XMEMORY_H
+#ifdef HAVE_OMALLOC
                  : public omallocClass
 #endif
@@ -505 +507 @@
 #ifdef HAVE_RINGS
 int redRing (LObject* h,kStrategy strat);
+int redRing_Z (LObject* h,kStrategy strat);
 int redRiloc (LObject* h,kStrategy strat);
 void enterExtendedSpoly(poly h,kStrategy strat);
@@ -573 +576 @@
 void kFreeStrat(kStrategy strat);
 void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
+void pairLcmCriterion(kStrategy strat);
 void chainCritNormal (poly p,int ecart,kStrategy strat);
 void chainCritOpt_1 (poly,int,kStrategy strat);
@@ -592 +596 @@
 ///        number of first divisor in T, otherwise
 int kFindDivisibleByInT(const kStrategy strat, const LObject* L, const int start=0);
+int kFindDivisibleByInT_Z(const kStrategy strat, const LObject* L, const int start=0);
 
 /// return -1 if no divisor is found
@@ -693 +698 @@
                  kStrategy strat = NULL);
 
+int ksReducePolyLC(LObject* PR,
+                 TObject* PW,
+                 poly spNoether = NULL,
+                 number *coef = NULL,
+                 kStrategy strat = NULL);
+
 int ksReducePolyBound(LObject* PR,
                  TObject* PW,