Changeset b4ab6fb in git for Singular/iparith.cc

Timestamp:

May 8, 2006, 7:45:31 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ef8adb7b933493dbcb80792c9d08a0406bb6d8b7

Parents:

54b460b5e3bb8b89e445c43cbe3540f147ea8d84

Message:

*hannes: homo tests


git-svn-id: file:///usr/local/Singular/svn/trunk@9118 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.393 2006-05-08 15:00:38 Singular Exp $ */
+/* $Id: iparith.cc,v 1.394 2006-05-08 17:45:31 Singular Exp $ */
 
 /*
@@ -2058 +2058 @@
      else
      {
-       if ((!idHomModule(u_id,currQuotient,&w_v))
-       || (!idHomModule(v_id,currQuotient,&w_v)))
+       if ((!idTestHomModule(u_id,currQuotient,w_v))
+       || (!idTestHomModule(v_id,currQuotient,w_v)))
        {
          WarnS("wrong weights");
@@ -2619 +2619 @@
   if (w!=NULL)
   {
-     //if (!idHomModule(u_id,currQuotient,&w))
-     //{
-     //  WarnS("wrong weights");
-     //  w=NULL;
-     //}
-     //else
-     {
-       w=ivCopy(w);
-       hom=isHomog;
-     }
+    if (!idTestHomModule(u_id,currQuotient,w))
+    {
+      WarnS("wrong weights");
+      w=NULL;
+    }
+    else
+    {
+      w=ivCopy(w);
+      hom=isHomog;
+    }
   }
   result=kStd(u_id,currQuotient,hom,&w,(intvec *)v->Data());
@@ -2639 +2639 @@
 static BOOLEAN jjSTD_1(leftv res, leftv u, leftv v)
 {
+  ideal result;
   assumeStdFlag(u);
-  ideal result;
-  ideal u_id=(ideal)(u->Data());
+  ideal i1=(ideal)(u->Data());
+  ideal i0=idInit(1,i1->rank);
+  i0->m[0]=(poly)v->Data();
+  i1=idSimpleAdd(i1,i0);
+  i0->m[0]=NULL;
+  idDelete(&i0);
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
   if (w!=NULL)
   {
-     if (!idHomModule(u_id,currQuotient,&w))
-     {
-       WarnS("wrong weights");
-       w=NULL;
-     }
-     else
-     {
-       w=ivCopy(w);
-       hom=isHomog;
-     }
-  }
-  ideal i0=idInit(1,u_id->rank);
-  i0->m[0]=(poly)v->Data();
-  u_id=idSimpleAdd(u_id,i0);
-  i0->m[0]=NULL;
-  idDelete(&i0);
+    if (!idTestHomModule(i1,currQuotient,w))
+    {
+      // no warnung: this is legal, if i in std(i,p)
+      // is homogeneous, but p not
+      w=NULL;
+    }
+    else
+    {
+      w=ivCopy(w);
+      hom=isHomog;
+    }
+  }
   BITSET save_test=test;
   test|=Sy_bit(OPT_SB_1);
-  result=kStd(u_id,currQuotient,hom,&w,NULL,0,IDELEMS(u_id)-1);
+  result=kStd(i1,currQuotient,hom,&w,NULL,0,IDELEMS(i1)-1);
   test=save_test;
-  idDelete(&u_id);
+  idDelete(&i1);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -3763 +3764 @@
   if (w!=NULL)
   {
-     if (!idHomModule(v_id,currQuotient,&w))
-     {
-       WarnS("wrong weights");
-       w=NULL;
-     }
-     else
-     {
-       w=ivCopy(w);
-       intvec **ww=&w;
-       res->data = (char *)idMinEmbedding(v_id,FALSE,ww);
-       atSet(res,omStrDup("isHomog"),*ww,INTVEC_CMD);
-       return FALSE;
-     }
-  }
-  //else // both else branches
+    if (!idTestHomModule(v_id,currQuotient,w))
+    {
+      WarnS("wrong weights");
+      w=NULL;
+      // and continue at the non-homog case below
+    }
+    else
+    {
+      w=ivCopy(w);
+      intvec **ww=&w;
+      res->data = (char *)idMinEmbedding(v_id,FALSE,ww);
+      atSet(res,omStrDup("isHomog"),*ww,INTVEC_CMD);
+      return FALSE;
+    }
+  }
   res->data = (char *)idMinEmbedding(v_id);
   return FALSE;
@@ -3868 +3869 @@
   if (w!=NULL)
   {
-    if (!idHomModule(u_id,currQuotient,&w))
+    if (!idTestHomModule(u_id,currQuotient,w))
     {
       WarnS("wrong weights");
@@ -3892 +3893 @@
   if (w!=NULL)
   {
-    if (!idHomModule(v_id,currQuotient,&w))
+    if (!idTestHomModule(v_id,currQuotient,w))
     {
       WarnS("wrong weights");
@@ -3899 +3900 @@
     else
     {
+      hom=isHomog;
       w=ivCopy(w);
-      hom=isHomog;
     }
   }
@@ -3936 +3937 @@
     add_row_shift=w->min_in();
     (*w)-=add_row_shift;
-    if (idHomModule(v_id,currQuotient,&w))
+    if (idTestHomModule(v_id,currQuotient,w))
       hom=isHomog;
     else
@@ -5339 +5340 @@
     if (iv!=NULL)
     {
-      if (!idHomModule(u_id,currQuotient,&iv))
+      if (!idTestHomModule(u_id,currQuotient,iv))
       {
         WarnS("wrong weights");
@@ -5383 +5384 @@
   if (ww!=NULL)
   {
-    if (!idHomModule(u_id,currQuotient,&ww))
+    if (!idTestHomModule(u_id,currQuotient,ww))
     {
       WarnS("wrong weights");