Changeset f43a74 in git for Singular/ipassign.cc

Timestamp:

May 18, 2005, 5:59:37 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

42f5a8bf6b4c7bed01fc4375213acbce2abcfe04

Parents:

b340969c053d9f828187f38bac97b1feb96e654e

Message:

*hannes: new lib: sheafcohom.lib
         weight stuff
         load stuff


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

File:

• Singular/ipassign.cc (modified) (6 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.74 2005-05-03 16:12:03 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.75 2005-05-18 15:59:35 Singular Exp $ */
 
 /*
@@ -291 +291 @@
   syStrategy r=(syStrategy)a->CopyD(RESOLUTION_CMD);
   if (res->data!=NULL) ((lists)res->data)->Clean();
-  res->data=(void *)syConvRes(r,TRUE);
+  int add_row_shift = 0;
+  intvec *weights=(intvec*)atGet(a,"isHomog",INTVEC_CMD);
+  if (weights!=NULL)  add_row_shift=weights->min_in();
+  res->data=(void *)syConvRes(r,TRUE,add_row_shift);
   //jiAssignAttr(res,a);
   return FALSE;
@@ -343 +346 @@
     if ((p!=NULL) && (pGetComp(p)!=0))
     {
-      m->rank=max(m->rank,pMaxComp(p));
+      m->rank=si_max(m->rank,pMaxComp(p));
     }
   }
@@ -973 +976 @@
     {
       intvec *ivv = (intvec *)(hh->Data());
-      int ll = 0,l = min(ivv->length(),iv->length());
+      int ll = 0,l = si_min(ivv->length(),iv->length());
       for (; l>0; l--)
       {
@@ -1463 +1466 @@
             lm->m[i]=(poly)t.CopyD(etyp);
             pNormalize(lm->m[i]);
-            if (module_assign) rk=max(rk,pMaxComp(lm->m[i]));
+            if (module_assign) rk=si_max(rk,pMaxComp(lm->m[i]));
             i++;
           }
@@ -1475 +1478 @@
             if (module_assign)
             {
-              j = min(num,rm->cols());
-              rk=max(rk,rm->rank);
+              j = si_min(num,rm->cols());
+              rk=si_max(rk,rm->rank);
             }
             else
-              j = min(num-i,rm->rows() * rm->cols());
+              j = si_min(num-i,rm->rows() * rm->cols());
             for(k=0;k<j;k++,i++)
             {