Changeset f999689 in git

Timestamp:

Jan 26, 2015, 12:43:16 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1386125efea2b96cc1b1eb9c36caa5004c0f47f6766ae30cf1b9a4f004ee11825797b33b8798ae39

Parents:

97a7da2750245efc953ff12aad2e56a4bff4374e

Message:

chnaged: Presolve::findvars: see variables

Files:

• Singular/LIB/JMSConst.lib (modified) (1 diff)
• Singular/LIB/ffsolve.lib (modified) (1 diff)
• Singular/LIB/noether.lib (modified) (2 diffs)
• Singular/LIB/normal.lib (modified) (6 diffs)
• Singular/LIB/presolve.lib (modified) (6 diffs)
• Singular/LIB/resolve.lib (modified) (7 diffs)
• Tst/Manual/findvars.res.gz.uu (modified) (1 diff)
• Tst/Manual/findvars.tst (modified) (1 diff)

Singular/LIB/JMSConst.lib

@@ -947 +947 @@
 poly h=Minimus(variables(A.h));
 //print(h);
-int l=findvars(h,1)[2][1];
+int l=findvars(h)[2][1];
 if(l!=nvars(basering))
  {

Singular/LIB/ffsolve.lib

@@ -383 +383 @@
         }
       }
-      varinfo = findvars(univar_part,1);
+      varinfo = varaibles(univar_part);
       unsolved_vars = varinfo[3];
       unsolved_var_nums = varinfo[4];

Singular/LIB/noether.lib

@@ -67 +67 @@
    for ( ii = 1; ii <= size(I); ii++ )
    {
-     Y=findvars(I[ii],1)[1];
+     Y=variables(I[ii]);
      l=rvar(Y[1][1]);
      if (size(Y[1])==1)
@@ -89 +89 @@
    else
    {
-     P2=findvars(ideal(P1[1..t]),1)[3];
+     P2=findvars(ideal(P1[1..t]))[3];
      for ( jj = 1; jj <= size(P2[1]); jj++ )
      {

Singular/LIB/normal.lib

@@ -1148 +1148 @@
           "// the ideal was the zero-ideal";
       }
-     // execute("ring newR7="+charstr(basering)+",("+varstr(basering)+"),("
-     //                 +ordstr(basering)+");");
          def newR7 = ring(gnirlist);
          setring newR7;
@@ -1597 +1595 @@
          // Now RR[2] must be 1, hence the test for normality was positive
          MB=SM[2];
-         //execute("ring newR7="+charstr(basering)+",("+varstr(basering)+"),("
-         //             +ordstr(basering)+");");
          def newR7 = ring(gnirlist);
          setring newR7;
@@ -1901 +1897 @@
       //ideal new2=SL[1],SM[2];
 
-      //execute("ring newR1="+charstr(basering)+",("+varstr(basering)+"),("
-      //                +ordstr(basering)+");");
       def newR1 = ring(gnirlist);
       setring newR1;
@@ -1930 +1924 @@
 
       setring BAS;
-      //execute("ring newR2="+charstr(basering)+",("+varstr(basering)+"),("
-      //                +ordstr(basering)+");");
       def newR2 = ring(gnirlist);
       setring newR2;
@@ -2285 +2277 @@
       return(0);
    }
-   list N=findvars(I,0);
-   if(size(N[1])==1)
+   ideal N=variables(I);
+   if(size(N)==1)
    {
       poly p=I[1];
@@ -2292 +2284 @@
       return(-deg(p)+1);
    }
-   if(size(N[1]) < nvars(R0))
-   {
-     string newvar=string(N[1]);
+   if(size(N) < nvars(R0))
+   {
+     string newvar=string(N);
      execute("ring R=("+charstr(R0)+"),("+newvar+"),dp;");
      ideal I =imap(R0,I);

Singular/LIB/presolve.lib

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////
-version="version presolve.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version presolve.lib 4.0.1.2 Jan_2015 "; // $Id$
 category="Symbolic-numerical solving";
 info="
@@ -12 +12 @@
  elimpartanyr(i,p);     factors of p partially eliminated from i in any ring
  fastelim(i,p[..]);     fast elimination of factors of p from i [options]
- findvars(id[..]);      ideal of variables occuring in id [more information]
+ findvars(id);          variables occuring/not occurring  in id
  hilbvec(id[,c,o]);     intvec of Hilberseries of id [in char c and ord o]
  linearpart(id);        elements of id of total degree <=1
@@ -837 +837 @@
 
 proc findvars(def id, list #)
-"USAGE:   findvars(id [,any] ); id=poly/ideal/vector/module/matrix, any=any type
-RETURN:  if no second argument is present: ideal of variables occuring in id,@*
-         if a second argument is given (of any type): list L with 4 entries:
+"USAGE:   findvars(id ); id=poly/ideal/vector/module/matrix
+RETURN:  list L with 4 entries:
   @format
   L[1]: ideal of variables occuring in id
@@ -846 +845 @@
   L[4]: intvec of variables not occuring in id
   @end format
+SEE ALSO: variables
 EXAMPLE: example findvars; shows an example
 "
@@ -873 +873 @@
    if ( size(f)>1 ) { f = f[2..size(f)]; }      //intvec of found vars
    if ( size(nf)>1 ) { nf = nf[2..size(nf)]; }  //intvec of vars not found
-   if( size(#)==0 )  { return(found); }
-   if( size(#)!=0 )  { list L = found,f,notfound,nf; return(L); }
+   list L = found,f,notfound,nf; return(L);
 }
 example
@@ -881 +880 @@
    ideal i = w2+f2-1, x2+t2+a2-1;
    findvars(i);
-   findvars(i,1);
 }
 ///////////////////////////////////////////////////////////////////////////////

Singular/LIB/resolve.lib

@@ -389 +389 @@
 //--- then by dropping non-occuring variables
       testId=Jsub,Esub,laM;
-      templist=findvars(testId,0);
+      templist=findvars(testId);
       if(size(templist[1])<nvars(R))
       {
@@ -617 +617 @@
             LL=LL,BO[4][j];
          }
-         LL=findvars(LL);
+         LL=variables(LL);
          L=elimpart(BO[2]);
          if((size(L[2])!=0)&&(size(std(LL+L[2]))==size(L[2])+size(LL)))
@@ -633 +633 @@
         K=K,BO[4][j];
       }
-      list N=findvars(K,0);
+      list N=findvars(K);
       if(size(N[1])<n)
       {
@@ -1073 +1073 @@
                  if(deg(MM[1])>0){LL=LL,MM;}
               }
-              LL=findvars(LL);
+              LL=variables(LL);
               M=elimpart(B[2]);
               if((size(M[2])!=0)&&(size(std(LL+M[2]))==size(M[2])+size(LL)))
@@ -1105 +1105 @@
         K=B[1],B[2],B[5];          //Aenderung!!!
         for(j=1;j<=size(B[4]);j++){K=K,B[4][j];}
-        N=findvars(K,0);
+        N=findvars(K);
         if(size(N[1])<n)
         {
@@ -1153 +1153 @@
 //--- this variable
 //!!!! not necessarily in exactly one BO[4][j]
-        list N=findvars(BO[1]+BO[2],0);
+        list N=findvars(BO[1]+BO[2]);
         if(size(N[1])<nvars(basering))
         {
@@ -4795 +4795 @@
         K=K,BO[4][i];
       }
-      list N=findvars(K,0);
-      //list N=findvars(BO[2],0);
+      list N=findvars(K);
+      //list N=findvars(BO[2]);
       if(size(N[1])<n)
       {

Tst/Manual/findvars.res.gz.uu

@@ -1 +1 @@
 begin 640 findvars.res.gz
-M'XL("'XI<DX``V9I;F1V87)S+G)E<P!-D<MJPS`01??ZBB%TX9"IB60[:1ND
-M1>DF4+I)=\$$%<M%8-Q@R8_\?2>JD;NZ5VC.89!.GV_'#P#@"MZ/K[#RSJ>-
-M_5H=@-K%MM8GZP.[)R@%M6VK07<N;<V8.J\].\V\F/EK9]Q/,Y@_2;S.%'2V
-M_08'(&&+B<$:)[RAQQX''%%CM<;JN@"Y`EL9W8`E8!2;6CQRA$ELO-AHZLMD
-ML:R56-KU<N:EK"E$*2>*K)2>(B_E2%&44D=T]Q]%3C"Q+XQN9DEHP1-:4(46
-M;*$%(<T$3&"&!3[A,Z/9162BZ!9%?10-450Q.@>,8XX[W"/?QF7W*GS)_=5[
-.E]"R#^P7BXXF)KT!````
+M'XL("/4FQE0``V9I;F1V87)S+G)E<P!%D,MJPS`01??ZBB%T8>.IB60[?1AI
+M4;H)E&[271%!17(1&#=8\B-_7\4.\DI'TMS#94Y?[\=/`*`"/HYOL//.YZW]
+MV=40Z&P[ZY.T)K<3A(#&=GI4O<L[,^7.*T].]SR[YR^]<7_M:%9)_"X$]+;[
+M!0?`88^)P09GO*+'`4><4*%.45^V0"G`:J-:L"$PL:QACQ1A9IEGF0J\359;
+MK<2&KM]4OI+P?@[`FY68Y/-*A>1^I5+R::5*<D7"S!)C6&"%S_A"PNPF,E%T
+HC:(ABL8HTB3<EQC%$@_XA'0?JQ[$LM7;X@:7T+1^(/^1SG.A@`$`````
 `
 end

Tst/Manual/findvars.tst

@@ -4 +4 @@
 ideal i = w2+f2-1, x2+t2+a2-1;
 findvars(i);
-findvars(i,1);
 tst_status(1);$