Changeset 188cfbd in git

Timestamp:

Apr 17, 2015, 2:45:34 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f52bd59412a399cb6c4ca21c965dd68c19aa5def

Parents:

7203f75e9a4e317e9e009db8a853ed8c0e6be6357cb9b47e0c889244f467795deb33c7c8156369b4

Message:

Merge pull request #711 from YueRen/max_min_multiple_arguments

chg: min and max now take more than 2 inputs

File:

• Singular/LIB/standard.lib (modified) (2 diffs)

Singular/LIB/standard.lib

@@ -17 +17 @@
  par2varRing([i])       create a ring making pars to vars, together with i
  datetime()             return date and time as a string
- max(i,j)               maximum of i and j
- min(i,j)               minimum of i and j
+ max(i_1,...,i_k)       maximum of i_1, ..., i_k
+ min(i_1,...,i_k)       minimum of i_1, ..., i_k
 
 ";
@@ -2185 +2185 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-proc max(def i,def j)
-"SYNTAX: max (i, j)
-TYPE:    same as type of i resp. j
-PURPOSE: returns the maximum for any 2 arguments of a type
+proc max(def i,list #)
+"SYNTAX: max (i_1, ..., i_k)
+TYPE:    same as type of i_1, ..., i_k resp.
+PURPOSE: returns the maximum for any arguments of a type
          for which '>' is defined
 SEE ALSO: min
 EXAMPLE: example max; shows an example"
 {
-  if(i>j){return(i);}
-  return(j);
+  def maximum = i;
+  for (int j=1; j<=size(#); j++)
+  {
+    if(#[j]>maximum)
+    {
+      maximum = #[j];
+    }
+  }
+  return(maximum);
 }
 example
 { "EXAMPLE:"; echo=2;
+  // biggest int
   max(2,3);
-  max(4,3);
+  max(1,4,3);
+  // lexicographically biggest intvec
+  max(intvec(1,2),intvec(0,1),intvec(1,1));
+  // polynopmial with biggest leading monomial
+  ring r = 0,x,dp;
+  max(x+1,x2+x);
 }
 ///////////////////////////////////////////////////////////////////////////////
-proc min(def i,def j)
-"SYNTAX: min (i, j)
-TYPE:    same as type of i resp. j
-PURPOSE: returns the minimum for any 2 arguments of a type
+proc min(def i,list #)
+"SYNTAX: min (i_1, ..., i_k)
+TYPE:    same as type of i_1, ..., i_k resp.
+PURPOSE: returns the minimum for any arguments of a type
          for which '>' is defined
 SEE ALSO: max
 EXAMPLE: example min; shows an example"
 {
-  if(i>j){return(j);}
-  return(i);
+  def minimum = i;
+  for (int j=1; j<=size(#); j++)
+  {
+    if(#[j]<minimum)
+    {
+      minimum = #[j];
+    }
+  }
+  return(minimum);
 }
 example
 { "EXAMPLE:"; echo=2;
+  // smallest int
   min(2,3);
-  min(4,3);
+  min(1,4,3);
+  // lexicographically smallest intvec
+  min(intvec(1,2),intvec(0,1),intvec(1,1));
+  // polynopmial with smallest leading monomial
+  ring r = 0,x,dp;
+  min(x+1,x2+x);
 }