Changeset fcf6c4 in git

Timestamp:

Apr 12, 2019, 1:52:33 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

51b5853275964eb90183d3490cd0f77df75505c1

Parents:

8cfc9149aafe2ed41aafc94efb1cddf86a07bbcf

Message:

fix: use of isHomog

Files:

• Singular/iparith.cc (modified) (6 diffs)
• Singular/table.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)

Singular/iparith.cc

@@ -2314 +2314 @@
 static BOOLEAN jjFRES3(leftv res, leftv u, leftv v, leftv w)
 {
-    assumeStdFlag(u);
-    ideal id = (ideal)u->Data();
-    int max_length = (int)(long)v->Data();
-    if (max_length < 0) {
-        WerrorS("length for fres must not be negative");
-        return TRUE;
-    }
-    if (max_length == 0) {
-        max_length = currRing->N+1;
-        if (currRing->qideal != NULL) {
-            Warn("full resolution in a qring may be infinite, "
-                "setting max length to %d", max_length);
-        }
-    }
-    char *method = (char *)w->Data();
-    /* For the moment, only "complete" (default), "frame", or "extended frame"
-     * are allowed. Another useful option would be "linear strand".
-     */
-    if (strcmp(method, "complete") != 0
-            && strcmp(method, "frame") != 0
-            && strcmp(method, "extended frame") != 0
-            && strcmp(method, "single module") != 0) {
-        WerrorS("wrong optional argument for fres");
-    }
-    syStrategy r = syFrank(id, max_length, method);
-    assume(r->fullres != NULL);
-    res->data = (void *)r;
-    return FALSE;
+  assumeStdFlag(u);
+  ideal id = (ideal)u->Data();
+  int max_length = (int)(long)v->Data();
+  if (max_length < 0)
+  {
+    WerrorS("length for fres must not be negative");
+    return TRUE;
+  }
+  if (max_length == 0)
+  {
+    max_length = currRing->N+1;
+    if (currRing->qideal != NULL)
+    {
+      Warn("full resolution in a qring may be infinite, "
+           "setting max length to %d", max_length);
+    }
+  }
+  char *method = (char *)w->Data();
+  /* For the moment, only "complete" (default), "frame", or "extended frame"
+   * are allowed. Another useful option would be "linear strand".
+   */
+  if (strcmp(method, "complete") != 0
+  && strcmp(method, "frame") != 0
+  && strcmp(method, "extended frame") != 0
+  && strcmp(method, "single module") != 0)
+  {
+    WerrorS("wrong optional argument for fres");
+    return TRUE;
+  }
+  syStrategy r = syFrank(id, max_length, method);
+  assume(r->fullres != NULL);
+  res->data = (void *)r;
+  return FALSE;
 }
 
@@ -3483 +3488 @@
 {
   // see jjSYZYGY
+  intvec *ww=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   intvec *w=NULL;
+  tHomog hom=testHomog;
   ideal I=(ideal)u->Data();
   GbVariant alg=syGetAlgorithm((char*)v->Data(),currRing,I);
-  res->data = (char *)idSyzygies(I,testHomog,&w,TRUE,FALSE,NULL,alg);
+  if (ww!=NULL)
+  {
+    if (idTestHomModule(I,currRing->qideal,ww))
+    {
+      w=ivCopy(ww);
+      int add_row_shift=w->min_in();
+      (*w)-=add_row_shift;
+      hom=isHomog;
+    }
+    else
+    {
+      //WarnS("wrong weights");
+      delete ww; ww=NULL;
+      hom=testHomog;
+    }
+  }
+  else
+  {
+    if (u->Typ()==IDEAL_CMD)
+      if (idHomIdeal(I,currRing->qideal))
+        hom=isHomog;
+  }
+  ideal S=idSyzygies(I,hom,&w,TRUE,FALSE,NULL,alg);
   if (w!=NULL) delete w;
+  res->data = (char *)S;
+  if (hom==isHomog)
+  {
+    int vl=S->rank;
+    intvec *vv=new intvec(vl);
+    if ((u->Typ()==IDEAL_CMD)||(ww==NULL))
+    {
+      for(int i=0;i<vl;i++)
+      {
+        if (I->m[i]!=NULL)
+          (*vv)[i]=p_Deg(I->m[i],currRing);
+      }
+    }
+    else
+    {
+      p_SetModDeg(ww, currRing);
+      for(int i=0;i<vl;i++)
+      {
+        if (I->m[i]!=NULL)
+          (*vv)[i]=currRing->pFDeg(I->m[i],currRing);
+      }
+      p_SetModDeg(NULL, currRing);
+    }
+    if (idTestHomModule(S,currRing->qideal,vv))
+      atSet(res,omStrDup("isHomog"),vv,INTVEC_CMD);
+    else
+      delete vv;
+  }
   if (TEST_OPT_RETURN_SB) setFlag(res,FLAG_STD);
   return FALSE;
@@ -3620 +3677 @@
 static BOOLEAN jjDUMMY(leftv res, leftv u)
 {
-  res->data = (char *)u->CopyD();
+//  res->data = (char *)u->CopyD();
+// also copy attributes:
+  res->Copy(u);
   return FALSE;
 }
@@ -4446 +4505 @@
 }
 
-
 static BOOLEAN jjKBASE(leftv res, leftv v)
 {
@@ -5089 +5147 @@
   ideal v_id=(ideal)v->Data();
   tHomog hom=testHomog;
-  int add_row_shift=0;
   if (ww!=NULL)
   {
@@ -5095 +5152 @@
     {
       w=ivCopy(ww);
-      add_row_shift=w->min_in();
+      int add_row_shift=w->min_in();
       (*w)-=add_row_shift;
       hom=isHomog;

Singular/table.h

@@ -663 +663 @@
 ,{D(jjHILBERT2),  HILBERT_CMD,    INTVEC_CMD,     MODUL_CMD,  INT_CMD, ALLOW_PLURAL | ALLOW_RING | NO_ZERODIVISOR}
 ,{D(jjHOMOG1_W),  HOMOG_CMD,      INT_CMD,        IDEAL_CMD,  INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
-,{D(jjHOMOG1_W),  HOMOG_CMD,      INT_CMD,        MODUL_CMD,   INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjHOMOG1_W),  HOMOG_CMD,      INT_CMD,        MODUL_CMD,  INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjHOMOG_P),   HOMOG_CMD,      POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjHOMOG_P),   HOMOG_CMD,      VECTOR_CMD,     VECTOR_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING}