Changeset 7829fb in git

Timestamp:

May 19, 2011, 6:03:06 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '7725b5cfc1eaf99630826ecc59f559d3b6831c24')

Children:

91446172434395b0770c641bab356bc95a9460a8

Parents:

7d1a268aa1413587bde9251dc496aa635a2a84e4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 06:03:06+02:00

git-committer:

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

Message:

ADD: trying to solve circular dependencies due to matrix

Location:

libpolys/polys

Files:

• matpol.h (modified) (1 diff)
• monomials/ring.cc (modified) (2 diffs)
• simpleideals.cc (modified) (1 diff)
• simpleideals.h (modified) (2 diffs)

libpolys/polys/matpol.h

@@ -30 +30 @@
   #define MATELEM(mat,i,j) ((mat)->m)[MATCOLS((mat)) * ((i)-1) + (j)-1]
 };
+
+typedef ip_smatrix *       matrix;
 
 matrix mpNew(int r, int c);

libpolys/polys/monomials/ring.cc

@@ -11 +11 @@
 #include <math.h>
 
-// #include <polys/options.h>
 #include <omalloc/omalloc.h>
 #include <misc/options.h>
-#include <polys/monomials/ring.h>
+#include <misc/intvec.h>
+
+#include <coeffs/numbers.h>
+#include <coeffs/coeffs.h>
+
 #include <polys/monomials/p_polys.h>
 #include <polys/simpleideals.h>
-#include <coeffs/numbers.h>
 // #include <???/febase.h>
 // #include <???/intvec.h>
 #include <polys/ext_fields/longalg.h>
 #include <polys/ext_fields/longtrans.h>
-#include <coeffs/ffields.h>
+// #include <coeffs/ffields.h>
 #include <polys/monomials/ring.h>
 #include <polys/monomials/maps.h>
@@ -30 +32 @@
 
 #include <polys/matpol.h>
+
+#include <polys/monomials/ring.h>
 
 #ifdef HAVE_PLURAL

libpolys/polys/simpleideals.cc

@@ -17 +17 @@
 #include <misc/intvec.h>
 
-#include <coeffs/longrat.h>
-  
+// #include <coeffs/longrat.h>
+#include "matpol.h"
+ 
 #include "monomials/p_polys.h"
 #include "weight.h"
-#include "matpol.h"
-#include "simpleideals.h"
 #include "sbuckets.h"
 #include "clapsing.h"
+
+#include "simpleideals.h"
 
 omBin sip_sideal_bin = omGetSpecBin(sizeof(sip_sideal));

libpolys/polys/simpleideals.h

@@ -10 +10 @@
 #include <omalloc/omalloc.h>
 #include <polys/monomials/ring.h>
+#include <polys/matpol.h>
 
 struct sip_sideal
@@ -31 +32 @@
   int ncols;
 };
-
-class ip_smatrix;
-typedef ip_smatrix *       matrix;
 
 struct sideal_list;