Changeset cfbcdce in git

Timestamp:

May 8, 2006, 3:28:10 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

4f0a5a7540e7e15b498f2c22ed22d461c02444f6

Parents:

fa98a4f5c478760aa9bbf122228fe2c21c16173c

Message:

*hannes: do not believe in isHomog: test


git-svn-id: file:///usr/local/Singular/svn/trunk@9110 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.390 2006-03-06 14:11:19 Singular Exp $ */
+/* $Id: iparith.cc,v 1.391 2006-05-08 13:28:10 Singular Exp $ */
 
 /*
@@ -2616 +2616 @@
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
+  ideal u_id=(ideal)(u->Data());
   if (w!=NULL)
   {
-    w=ivCopy(w);
-    hom=isHomog;
-  }
-  result=kStd((ideal)(u->Data()),currQuotient,hom,&w,(intvec *)v->Data());
+     if (!idHomModule(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());
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -2632 +2641 @@
   assumeStdFlag(u);
   ideal result;
+  ideal u_id=(ideal)(u->Data());
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
   if (w!=NULL)
   {
-    w=ivCopy(w);
-    hom=isHomog;
-  }
-  ideal i1=(ideal)u->Data();
-  ideal i0=idInit(1,i1->rank);
+     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();
-  i1=idSimpleAdd(i1,i0);
+  u_id=idSimpleAdd(u_id,i0);
   i0->m[0]=NULL;
   idDelete(&i0);
   BITSET save_test=test;
   test|=Sy_bit(OPT_SB_1);
-  result=kStd(i1,currQuotient,hom,&w,NULL,0,IDELEMS(i1)-1);
+  result=kStd(u_id,currQuotient,hom,&w,NULL,0,IDELEMS(u_id)-1);
   test=save_test;
-  idDelete(&i1);
+  idDelete(&u_id);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -3640 +3657 @@
   intvec *weights=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
   res->data=(char *)syMinimize((syStrategy)v->Data());
-  if (weights!=NULL) 
+  if (weights!=NULL)
     atSet(res, omStrDup("isHomog"),ivCopy(weights),INTVEC_CMD);
   return FALSE;
@@ -3742 +3759 @@
   if (w!=NULL)
   {
-    w=ivCopy(w);
-    intvec **ww=&w;
-    res->data = (char *)idMinEmbedding(v_id,FALSE,ww);
-    atSet(res,omStrDup("isHomog"),*ww,INTVEC_CMD);
-  }
-  else
-    res->data = (char *)idMinEmbedding(v_id);
+     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
+  res->data = (char *)idMinEmbedding(v_id);
   return FALSE;
 }
@@ -3835 +3861 @@
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
+  ideal u_id=(ideal)u->Data();
   if (w!=NULL)
   {
-    w=ivCopy(w);
-    hom=isHomog;
-  }
-  res->data=(char *)t_rep_gb(currRing, (ideal)u->Data());
+    if (!idHomModule(u_id,currQuotient,&w))
+    {
+      WarnS("wrong weights");
+      w=NULL;
+    }
+    else
+    {
+      w=ivCopy(w);
+      hom=isHomog;
+    }
+  }
+  res->data=(char *)t_rep_gb(currRing, u_id);
   setFlag(res,FLAG_STD);
   if (w!=NULL) atSet(res,omStrDup("isHomog"),w,INTVEC_CMD);
@@ -3848 +3883 @@
 {
   ideal result;
+  ideal v_id=(ideal)v->Data();
   intvec *w=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
   if (w!=NULL)
   {
-    w=ivCopy(w);
-    hom=isHomog;
-  }
-  result=kStd((ideal)(v->Data()),currQuotient,hom,&w);
+    if (!idHomModule(v_id,currQuotient,&w))
+    {
+      WarnS("wrong weights");
+      w=NULL;
+    }
+    else
+    {
+      w=ivCopy(w);
+      hom=isHomog;
+    }
+  }
+  result=kStd(v_id,currQuotient,hom,&w);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -5278 +5322 @@
 {
   int maxl=(int)v->Data();
+  ideal u_id=(ideal)u->Data();
   int l=0;
   resolvente r;
@@ -5290 +5335 @@
     if (iv!=NULL)
     {
-      weights = (intvec**)omAlloc0Bin(void_ptr_bin);
-      weights[0] = ivCopy(iv);
-      l=1;
-    }
-    r=syResolvente((ideal)u->Data(),maxl,&l, &weights, iiOp==MRES_CMD);
+      if (!idHomModule(u_id,currQuotient,&iv))
+      {
+        WarnS("wrong weights");
+        iv=NULL;
+      }
+      else
+      {
+        weights = (intvec**)omAlloc0Bin(void_ptr_bin);
+        weights[0] = ivCopy(iv);
+        l=1;
+      }
+    }
+    r=syResolvente(u_id,maxl,&l, &weights, iiOp==MRES_CMD);
   }
   else
@@ -5302 +5355 @@
   iiMakeResolv(r,l,wmaxl,w->name,t3,weights);
   return FALSE;
-  return TRUE;
 }
 #endif
@@ -5324 +5376 @@
   intvec *ww=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
+  ideal u_id=(ideal)(u->Data());
   if (ww!=NULL)
   {
-    ww=ivCopy(ww);
-    hom=isHomog;
-  }
-  result=kStd((ideal)(u->Data()),
+    if (!idHomModule(u_id,currQuotient,&ww))
+    {
+      WarnS("wrong weights");
+      ww=NULL;
+    }
+    else
+    {
+      ww=ivCopy(ww);
+      hom=isHomog;
+    }
+  }
+  result=kStd(u_id,
               currQuotient,
               hom,