Changeset 2244ca3 in git

Timestamp:

Jun 3, 2022, 4:26:02 PM (23 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

acf7b8de48ccf8ffe7822fe9785eb2a0f29e0e71

Parents:

c04a1902f8a24f0b456ea23b223d2c37cdd3d05d

Message:

fix: hInit

File:

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

kernel/combinatorics/hutil.cc

@@ -29 +29 @@
 STATIC_VAR scfmon hsecure= NULL;
 
-scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing)
-{
-  id_TestTail(S, currRing, tailRing);
-  if (Q!=NULL) id_TestTail(Q, currRing, tailRing);
-
-//   if (tailRing != currRing)
-    hisModule = id_RankFreeModule(S, currRing, tailRing);
-//  else
-//    hisModule = id_RankFreeModule(S, currRing);
+scfmon hInit(ideal S, ideal Q, int *Nexist, ring src)
+{
+  id_LmTest(S, src);
+  if (Q!=NULL) id_LmTest(Q, src);
+
+  hisModule = S->rank;
+  if (hisModule==1)
+  {
+    for(int i=IDELEMS(S)-1;i>=0;i--)
+    {
+      if (S->m[i]!=NULL)
+      {
+        int c=p_GetComp(S->m[i],src);
+        if (c==0) { hisModule=0; break;}
+        else if (c>hisModule) { hisModule=c; }
+      }
+    }
+  }
 
   if (hisModule < 0)
@@ -94 +103 @@
     if (*si!=NULL)
     {
-      *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
-      p_GetExpV(*si, *ek, currRing);
+      *ek = (scmon) omAlloc(((src->N)+1)*sizeof(int));
+      p_GetExpV(*si, *ek, src);
       ek++;
     }
@@ -104 +113 @@
     if (*qi!=NULL)
     {
-      *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
-      p_GetExpV(*qi, *ek, currRing);
+      *ek = (scmon) omAlloc(((src->N)+1)*sizeof(int));
+      p_GetExpV(*qi, *ek, src);
       ek++;
     }