Changeset b5726c in git

Timestamp:

Jan 7, 2001, 2:50:32 AM (22 years ago)

Author:

Gert-Martin Greuel <greuel@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

4cb6b8049b916680b0af4440be038380e9c4ac37

Parents:

e143c4c97746c0b2a52b6ee135eb652962690f84

Message:

* GMG: Kosmetik; proc ringweights entfernt und in ring.lib eingefuegt


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

File:

• Singular/LIB/general.lib (modified) (10 diffs)

Singular/LIB/general.lib

@@ -2 +2 @@
 //anne, added deleteSublist and watchdog 12.12.2000
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: general.lib,v 1.34 2000-12-31 15:14:46 obachman Exp $";
+version="$Id: general.lib,v 1.35 2001-01-07 01:50:32 greuel Exp $";
 category="General purpose";
 info="
@@ -20 +20 @@
  primes(n,m);           intvec of primes p, n<=p<=m
  product(../..[,v]);    multiply components of vector/ideal/...[indices v]
- ringweights(r);        intvec of weights of ring variables of ring r
  sort(ideal/module);    sort generators according to monomial ordering
  sum(vector/id/..[,v]); add components of vector/ideal/...[with indices v]
@@ -271 +270 @@
 EXAMPLE:  example factorial; shows an example
 "
-{   int l,p;
+{   int str,l,p;
 //---------------------------- initialization -------------------------------
    if ( size(#) == 0 )
-   {  
+   {  str = 1;
       ring bin = 0,x,dp;
       number r=1;
@@ -284 +283 @@
       {
          if ( p == char(basering) )
-         {
-           // do it clever !
-           if (n < 1) {return (0);}
-           if (! defined(sv_factorials))
-           {
-             ideal sv_factorials;
-             sv_factorials[1] = 1;
-             export(sv_factorials);
-           }
-           if (n > size(sv_factorials))
-           {
-             int i = size(sv_factorials);
-             sv_factorials[n] = 0;
-             number fi = number(sv_factorials[i]);
-             for (i++;i<=n;i++)
-             {
-               fi = fi * i;
-               sv_factorials[i] = fi;
-             }
-             return (fi);
-           }
-           else
-           {
-             return (number(sv_factorials[n]));
-           }
+         {  number r=1;
          }
          else
-         {  
+         {  str = 1;
             ring bin = p,x,dp;
             number r=1;
@@ -317 +292 @@
       }
       else
-      {  
+      {  str = 1;
          ring bin = p,x,dp;
          number r=1;
@@ -327 +302 @@
       r=r*l;
    }
-   return(string(r));
+   if ( str==1 ) { return(string(r)); }
+   else { return(r); }
 }
 example
@@ -336 +312 @@
    p;
 }
-    
-        
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -787 +761 @@
 }
 ///////////////////////////////////////////////////////////////////////////////
-proc ringweights (list # )
-"USAGE:   ringweights(P); P=name of an existing ring (true name, not a string)
-RETURN:  intvec consisting of the weights of the variables of P, as they 
-         appear when typing P;.
-NOTE:    This is useful when enlarging P but keeping the weights of the old
-         variables.
-EXAMPLE: example ringweights; shows an example
-"
-{
-   int ii,q,fi,fo,fia;
-   intvec rw,nw;
-   string os;
-   def P = #[1];
-   string osP = ordstr(P);
-   fo  = 1;
-//------------------------- find weights in ordstr(P) -------------------------
-   fi  = find(osP,"(",fo);
-   fia = find(osP,"a",fo)+find(osP,"w",fo)+find(osP,"W",fo);
-   while ( fia )
-   {
-      os = osP[fi+1,find(osP,")",fi)-fi-1];
-      if( find(os,",") )
-      {
-         execute("nw = "+os+";");
-         if( size(nw) > ii )
-         {
-             rw = rw,nw[ii+1..size(nw)];
-         }
-         else  {  ii = ii - size(nw); }
-
-         if( find(osP[1,fi],"a",fo) ) { ii = size(nw); }
-      }
-      else
-      {
-         execute("q = "+os+";");
-         if( q > ii )
-         {
-            nw = 0; nw[q-ii] = 0;
-            nw = nw + 1;          //creates an intvec 1,...,1 of length q-ii
-            rw = rw,nw;
-         }
-         else { ii = ii - q; }
-      }
-      fo  = fi+1;
-      fi  = find(osP,"(",fo);
-      fia = find(osP,"a",fo)+find(osP,"w",fo)+find(osP,"W",fo);
-   }
-//-------------- adjust weight vector to length = nvars(P)  -------------------
-   if( fo > 1 )
-   {                                            // case when weights were found
-      rw = rw[2..size(rw)];
-      if( size(rw) > nvars(P) )
-      {
-         rw = rw[1..nvars(P)];
-      }
-      if( size(rw) < nvars(P) )
-      {
-         nw=0; nw[nvars(P)-size(rw)]=0; nw=nw+1; rw=rw,nw;
-      }
-   }
-   else
-   {                                         // case when no weights were found
-      rw[nvars(P)]= 0; rw=rw+1;
-   }
-   return(rw);
-}
-example
-{"EXAMPLE:";  echo = 2;
-  ring r0 = 0,(x,y,z),dp;
-  ringweights(r0);
-  ring r1 = 0,x(1..5),(ds(3),wp(2,3));
-  ringweights(r1);"";
-  // an example for enlarging the ring, keeping the first weights:
-  intvec v = ringweights(r1),6,2,3,4,5;
-  ring R = 0,x(1..10),(a(v),dp);
-  ordstr(R);
-}
-
-///////////////////////////////////////////////////////////////////////////////
 
 proc sort (id, list #)
-"USAGE:   sort(id[v,o,n]); id=ideal/module/intvec/list(of intvec's or int's)
+"USAGE:   sort(id[v,o,n]); id = ideal/module/intvec/list(of intvec's or int's)
 @*       sort may be called with 1, 2 or 3 arguments in the following way:
 @*       sort(id[v,n]); v=intvec of positive integers, n=integer,
@@ -907 +802 @@
    intvec v;
    if ( defined(basering) ) { def P = basering; }
-   if ( size(#)==0 and (typeof(id)=="ideal" or typeof(id)=="module") )
+   if ( size(#)==0 and (typeof(id)=="ideal" or typeof(id)=="module"
+                        or typeof(id)=="matrix"))
    {
       id = simplify(id,2);
@@ -917 +813 @@
       else  { v = size(id)..1; }
    }
-   if ( size(#)>=1 and (typeof(id)=="ideal" or typeof(id)=="module") )
+   if ( size(#)>=1 and (typeof(id)=="ideal" or typeof(id)=="module"
+                        or typeof(id)=="matrix") )
    {
       if ( typeof(#[1])=="string" )