Changeset bc2ffb in git for Singular/iparith.cc

Timestamp:

Apr 5, 2019, 3:15:11 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f2051805b69b8fb17a6b2da657a6a290d2e69e43

Parents:

6b29f27d00172371b96eb5f545db8d0a6fe74d75

Message:

chg: syz computes module weights via "isHomog" (+tests)

File:

• Singular/iparith.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2230 +2230 @@
           c_par_names=currRing->cf->extRing->names;
         }
-        if (!rIsLPRing(r))
-        {
+        if (!rIsLPRing(r))
+        {
           maFindPerm(r->names,       r->N,       r_par_names, r_par,
                      currRing->names,currRing->N,c_par_names, c_par,
                      perm,par_perm, currRing->cf->type);
         }
-        #ifdef HAVE_SHIFTBBA
-        else
-        {
+        #ifdef HAVE_SHIFTBBA
+        else
+        {
           maFindPermLP(r->names,       r->N,       r_par_names, r_par,
                      currRing->names,currRing->N,c_par_names, c_par,
                      perm,par_perm, currRing->cf->type,r->isLPring);
-        }
-        #endif
+        }
+        #endif
       }
       else
@@ -2607 +2607 @@
   if (w_u!=NULL)
   {
+    //PrintS("modulo: wu:");w_u->show(INTVEC_CMD);PrintLn();
     w_u=ivCopy(w_u);
     hom=isHomog;
   }
+  //else PrintS("modulo: wu:none\n");
   intvec *w_v=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
   if (w_v!=NULL)
   {
+    //PrintS("modulo: wv:");w_v->show(INTVEC_CMD);PrintLn();
     w_v=ivCopy(w_v);
     hom=isHomog;
   }
+  //else PrintS("modulo: wv:none\n");
   if ((w_u!=NULL) && (w_v==NULL))
     w_v=ivCopy(w_u);
@@ -5068 +5072 @@
   return FALSE;
 }
-#if 1
+#if 0
 static BOOLEAN jjSYZYGY(leftv res, leftv v)
 {
@@ -5081 +5085 @@
 static BOOLEAN jjSYZYGY(leftv res, leftv v)
 {
-  intvec *w=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
+  intvec *ww=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
+  intvec *w=NULL;
   ideal v_id=(ideal)v->Data();
   tHomog hom=testHomog;
   int add_row_shift=0;
-  if (w!=NULL)
-  {
-    w=ivCopy(w);
-    add_row_shift=w->min_in();
-    (*w)-=add_row_shift;
-    if (idTestHomModule(v_id,currRing->qideal,w))
+  if (ww!=NULL)
+  {
+    if (idTestHomModule(v_id,currRing->qideal,ww))
+    {
+      w=ivCopy(ww);
+      add_row_shift=w->min_in();
+      (*w)-=add_row_shift;
       hom=isHomog;
+    }
     else
     {
       //WarnS("wrong weights");
-      delete w; w=NULL;
+      delete ww; ww=NULL;
       hom=testHomog;
     }
   }
-  res->data = (char *)idSyzygies(v_id,hom,&w);
-  if (w!=NULL)
-  {
-    atSet(res,omStrDup("isHomog"),w,INTVEC_CMD);
-  }
+  else
+  {
+    if (v->Typ()==IDEAL_CMD)
+      if (idHomIdeal(v_id,currRing->qideal))
+        hom=isHomog;
+  }
+  ideal S=idSyzygies(v_id,hom,&w);
+  res->data = (char *)S;
+  if (hom==isHomog)
+  {
+    int vl=S->rank;
+    intvec *vv=new intvec(vl);
+    if ((v->Typ()==IDEAL_CMD)||(ww==NULL))
+    {
+      for(int i=0;i<vl;i++)
+      {
+        if (v_id->m[i]!=NULL)
+          (*vv)[i]=p_Deg(v_id->m[i],currRing);
+      }
+    }
+    else
+    {
+      p_SetModDeg(ww, currRing);
+      for(int i=0;i<vl;i++)
+      {
+        if (v_id->m[i]!=NULL)
+          (*vv)[i]=currRing->pFDeg(v_id->m[i],currRing);
+      }
+      p_SetModDeg(NULL, currRing);
+    }
+    if (idTestHomModule(S,currRing->qideal,vv))
+      atSet(res,omStrDup("isHomog"),vv,INTVEC_CMD);
+    else
+      delete vv;
+  }
+  if (w!=NULL) delete w;
   return FALSE;
 }