Changeset f28c6c in git

Timestamp:

May 13, 2005, 5:29:19 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

f5515b4f738f8cffd92efc95b23701e61b8982f4

Parents:

b6eb14fd348d7efc8e50676bd4a3f35a83516571

Message:

*hannes: weights for res


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.360 2005-05-13 15:18:48 Singular Exp $ */
+/* $Id: iparith.cc,v 1.361 2005-05-13 15:29:19 Singular Exp $ */
 
 /*
@@ -2258 +2258 @@
   return FALSE;
 }
+#if 0
 static BOOLEAN jjRES(leftv res, leftv u, leftv v)
 {
@@ -2362 +2363 @@
   else
   {
-#if 0
+//#if 0
 // need to set weights for ALL components (sres)
     if (weights!=NULL)
@@ -2370 +2371 @@
       (r->weights)[0] = ivCopy(weights);
     }
+//#endif
+  }
+  if (ww!=NULL) { delete ww; ww=NULL; }
+  return FALSE;
+}
+#else
+static BOOLEAN jjRES(leftv res, leftv u, leftv v)
+{
+  int maxl=(int)v->Data();
+  if (maxl<0)
+  {
+    WerrorS("length for res must not be negative");
+    return TRUE;
+  }
+  int l=0;
+  //resolvente r;
+  syStrategy r;
+  intvec *weights=NULL;
+  int wmaxl=maxl;
+  ideal u_id=(ideal)u->Data();
+
+  maxl--;
+  if ((maxl==-1) /*&& (iiOp!=MRES_CMD)*/)
+  {
+    maxl = pVariables-1+2*(iiOp==MRES_CMD);
+    if (currQuotient!=NULL)
+    {
+      Warn(
+      "full resolution in a qring may be infinite, setting max length to %d",
+      maxl+1);
+    }
+  }
+  weights=(intvec*)atGet(u,"isHomog",INTVEC_CMD);
+  if (weights!=NULL)
+  {
+    if (!idTestHomModule(u_id,currQuotient,weights))
+    {
+      WarnS("wrong weights given:");weights->show();PrintLn();
+      weights=NULL;
+    }
+  }
+  intvec *ww=NULL;
+  int add_row_shift=0;
+  if (weights!=NULL)
+  {
+     ww=ivCopy(weights);
+     add_row_shift = ww->min_in();
+     (*ww) -= add_row_shift;
+  }
+
+  if ((iiOp == RES_CMD) || (iiOp == MRES_CMD))
+  {
+    r=syResolution(u_id,maxl, ww, iiOp==MRES_CMD);
+  }
+  else if (iiOp==SRES_CMD)
+  //  r=sySchreyerResolvente(u_id,maxl+1,&l);
+    r=sySchreyer(u_id,maxl+1);
+  else if (iiOp == LRES_CMD)
+  {
+    int dummy;
+    if((currQuotient!=NULL)||
+    (!idHomIdeal (u_id,NULL)))
+    {
+       WerrorS
+       ("`lres` not implemented for inhomogeneous input or qring");
+       return TRUE;
+    }
+    r=syLaScala3(u_id,&dummy);
+  }
+  else if (iiOp == KRES_CMD)
+  {
+    int dummy;
+    if((currQuotient!=NULL)||
+    (!idHomIdeal (u_id,NULL)))
+    {
+       WerrorS
+       ("`kres` not implemented for inhomogeneous input or qring");
+       return TRUE;
+    }
+    r=syKosz(u_id,&dummy);
+  }
+  else
+  {
+    int dummy;
+    if((currQuotient!=NULL)||
+    (!idHomIdeal (u_id,NULL)))
+    {
+       WerrorS
+       ("`hres` not implemented for inhomogeneous input or qring");
+       return TRUE;
+    }
+    r=syHilb(u_id,&dummy);
+  }
+  if (r==NULL) return TRUE;
+  //res->data=(void *)liMakeResolv(r,l,wmaxl,u->Typ(),weights);
+  r->list_length=wmaxl;
+  res->data=(void *)r;
+  if (ww!=NULL) { delete ww; ww=NULL; }
+  if ((r->weights!=NULL) && (r->weights[0]!=NULL))
+  {
+    ww=ivCopy(r->weights[0]);
+    if (weights!=NULL) (*ww) += add_row_shift;
+    atSet(res,omStrDup("isHomog"),ww,INTVEC_CMD);
+  }
+  else if (atGet(res,"isHomog",INTVEC_CMD)==NULL)
+  {
+    if (weights!=NULL)
+    {
+      atSet(res,omStrDup("isHomog"),ivCopy(weights),INTVEC_CMD);
+    }
+  }
+  return FALSE;
+}
 #endif
-  }
-  if (ww!=NULL) { delete ww; ww=NULL; }
-  return FALSE;
-}
 static BOOLEAN jjRSUM(leftv res, leftv u, leftv v)
 {