Changeset a4771e1 in git for kernel/combinatorics/hutil.cc

Timestamp:

Sep 15, 2014, 9:11:04 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f7d39bddf5a7034fe148956d21d0cbe5d13c0021

Parents:

c4e3190c68044083d3437866d1695d9e714d52b5

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-15 21:11:04+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:08:14+02:00

Message:

Separation of hilbert function into kernel/combinatorics/hilb.h + include cleanup

File:

• kernel/combinatorics/hutil.cc (modified) (4 diffs)

kernel/combinatorics/hutil.cc

@@ -6 +6 @@
 */
 
-
-
-
 #include <kernel/mod2.h>
-#include <kernel/structs.h>
+// #include <kernel/structs.h>
 #include <omalloc/omalloc.h>
-#include <kernel/ideals.h>
-#include <kernel/polys.h>
+
+#include <polys/simpleideals.h>
+#include <polys/monomials/p_polys.h>
+
+// #include <kernel/ideals.h>
+// #include <kernel/polys.h>
 #include <kernel/combinatorics/hutil.h>
 
@@ -33 +34 @@
 scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing)
 {
+  if (tailRing != currRing)
+    hisModule = id_RankFreeModule(S, currRing, tailRing);
+  else
+    hisModule = id_RankFreeModule(S, currRing);
+
+  if (hisModule < 0)
+    hisModule = 0;
+   
   int  sl, ql, i, k = 0;
   polyset si, qi, ss;
   scfmon ex, ek;
-  if (tailRing != currRing)
-    hisModule = id_RankFreeModule(S, currRing, tailRing);
-  else
-    hisModule = id_RankFreeModule(S,currRing);
-  if (hisModule < 0)
-    hisModule = 0;
+   
   if (S!=NULL)
   {
@@ -91 +95 @@
     {
       *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
-      pGetExpV(*si, *ek);
+      p_GetExpV(*si, *ek, currRing);
       ek++;
     }
@@ -101 +105 @@
     {
       *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
-      pGetExpV(*qi, *ek);
+      p_GetExpV(*qi, *ek, currRing);
       ek++;
     }