Changeset 44bf84 in git

Timestamp:

Mar 11, 2009, 10:43:29 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6872439b7590944bd69e6388ace91d8c08381594

Parents:

9815814eeb1856dd1d7c58ddf0c1f53374c516fc

Message:

*hannes: variables() -> ideal


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

Location:

Singular

Files:

• LIB/dmodapp.lib (modified) (3 diffs)
• iparith.cc (modified) (2 diffs)
• ipshell.cc (modified) (5 diffs)

Singular/LIB/dmodapp.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="$Id: dmodapp.lib,v 1.24 2009-03-10 16:27:56 Singular Exp $";
+version="$Id: dmodapp.lib,v 1.25 2009-03-11 09:43:29 Singular Exp $";
 category="Noncommutative";
 info="
@@ -1809 +1809 @@
   int ppl = printlevel - voice +2;
   def save = basering;
-  list L = variables(F);
-  int i = size(L);
+  ideal LI = variables(F);
+  list L;
+  int i = size(LI);
   if (i>1) { ERROR("poly has to be univariate")}
   if (i == 0)
@@ -1818 +1819 @@
     return(L);
   }
-  poly v = L[1];
+  poly v = LI[1];
   L = ringlist(save); L = L[1..4];
   L[2] = list(string(v));

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.499 2009-03-02 15:43:24 Singular Exp $ */
+/* $Id: iparith.cc,v 1.500 2009-03-11 09:43:29 Singular Exp $ */
 
 /*
@@ -5312 +5312 @@
 ,{jjTYPEOF,     TYPEOF_CMD,      STRING_CMD,     ANY_TYPE       ALLOW_PLURAL}
 ,{jjUNIVARIATE, UNIVARIATE_CMD,  INT_CMD,        POLY_CMD       ALLOW_PLURAL}
-,{jjVARIABLES_P,VARIABLES_CMD,   LIST_CMD,       POLY_CMD       ALLOW_PLURAL}
-,{jjVARIABLES_ID,VARIABLES_CMD,  LIST_CMD,       IDEAL_CMD       ALLOW_PLURAL}
-,{jjVARIABLES_ID,VARIABLES_CMD,  LIST_CMD,       MATRIX_CMD       ALLOW_PLURAL}
+,{jjVARIABLES_P,VARIABLES_CMD,   IDEAL_CMD,      POLY_CMD       ALLOW_PLURAL}
+,{jjVARIABLES_ID,VARIABLES_CMD,  IDEAL_CMD,      IDEAL_CMD       ALLOW_PLURAL}
+,{jjVARIABLES_ID,VARIABLES_CMD,  IDEAL_CMD,      MATRIX_CMD       ALLOW_PLURAL}
 ,{jjDUMMY,      VECTOR_CMD,      VECTOR_CMD,     VECTOR_CMD     ALLOW_PLURAL}
 ,{jjVDIM,       VDIM_CMD,        INT_CMD,        IDEAL_CMD      ALLOW_PLURAL}

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.202 2009-02-13 09:16:27 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.203 2009-03-11 09:43:29 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -5214 +5214 @@
 }
 
-void jjINT_S_TO_LIST(int n,int *e, leftv res)
-{
-  lists l=(lists)omAlloc0Bin(slists_bin);
-  l->Init(n);
+void jjINT_S_TO_ID(int n,int *e, leftv res)
+{
+  if (n==0) n=1;
+  ideal l=idInit(n,1);
   int i;
   poly p;
@@ -5225 +5225 @@
     {
       n--;
-      l->m[n].rtyp=POLY_CMD;
       p=pOne();
       pSetExp(p,i,1);
       pSetm(p);
-      l->m[n].data=(char *)p;
+      l->m[n]=p;
       if (n==0) break;
     }
@@ -5240 +5239 @@
   int *e=(int *)omAlloc0((pVariables+1)*sizeof(int));
   int n=pGetVariables((poly)u->Data(),e);
-  jjINT_S_TO_LIST(n,e,res);
+  jjINT_S_TO_ID(n,e,res);
   return FALSE;
 }
@@ -5254 +5253 @@
     n=pGetVariables(I->m[i],e);
   }
-  jjINT_S_TO_LIST(n,e,res);
+  jjINT_S_TO_ID(n,e,res);
   return FALSE;
 }