Changeset af598e in git for libpolys/polys/clapsing.cc

Timestamp:

May 4, 2011, 7:50:23 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

107b6a63f83a561264dff51b21ba9a08c2b381f8

Parents:

02c42db0b19db524ec869930bffc30346b16abed

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-04 19:50:23+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:35+01:00

Message:

ADD: factory-related wrappers (clapsing.cc/.h)
FIX: ring-dependent fixes for some factory-dependent code
TODO: finish fixing clapsing.cc/.h

File:

• libpolys/polys/clapsing.cc (moved) (moved from kernel/clapsing.cc) (3 diffs)

libpolys/polys/clapsing.cc

@@ -9 +9 @@
 
 //#define FACTORIZE2_DEBUG
-#include <kernel/mod2.h>
+#include "config.h"
+#include <misc/auxiliary.h>
+
+
+TODO(Martin, Please adapt the following code for the use in SW)
+#ifdef HAVE_FACTORY
+
+#define SI_DONT_HAVE_GLOBAL_VARS
 #include <omalloc/omalloc.h>
-#ifdef HAVE_FACTORY
-#define SI_DONT_HAVE_GLOBAL_VARS
-#include <kernel/structs.h>
-#include <kernel/clapsing.h>
-#include <kernel/numbers.h>
-#include <kernel/ring.h>
-#include <kernel/ideals.h>
-#include <kernel/ffields.h>
+#include <coeffs/numbers.h>
+#include <coeffs/coeffs.h>
+
+// #include <kernel/ffields.h>
+// #include <kernel/clapconv.h>
+// #include <libfac/factor.h>
+
 #include <factory/factory.h>
-#include <kernel/clapconv.h>
-#include <libfac/factor.h>
-#include <kernel/ring.h>
+
+#include "clapsing.h"
+#include "monomials/ring.h"
+#include "simpleideals.h"
+
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
@@ -1652 +1660 @@
   return mm;
 }
-#endif
-
+/*
 napoly singclap_alglcm ( napoly f, napoly g )
 {
@@ -1735 +1742 @@
  Off(SW_RATIONAL);
 }
+*/
 
 #if 0