Changeset 4de1db in git

Timestamp:

Jan 19, 2011, 7:09:50 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

93134ce8b1735ff9eee324c4ecb029187ba24c08

Parents:

8c097e100503580a34ad9e198d2f1c1adaad7576

Message:

FIX: issues in homolog.lib (Tor/Ext/Ext_R)
ADD: BUG in general.lib (sort)

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

Location:

Singular/LIB

Files:

• general.lib (modified) (1 diff)
• homolog.lib (modified) (4 diffs)

Singular/LIB/general.lib

@@ -797 +797 @@
    module( M[ sort(lead(M), "c,dp")[2] ] );
    sort( M, sort(lead(M), "c,dp")[2] )[1];
+
+   // BUG: Please, don't use this sort for integer vectors or lists 
+   // with them if there can be negative integers!
+   // TODO: for some HiWi
+   sort(3..-3)[1]; 
+   sort(list(-v, v))[1]; 
+
 }
 ///////////////////////////////////////////////////////////////////////////////

Singular/LIB/homolog.lib

@@ -497 +497 @@
   intvec A1,A2,A3;
   int s = size(v);
-  intvec v1 = sort(v)[1];
-  max = v1[s];                 // the maximum integer occurring in intvec v
+  max = Max(v);                // the maximum integer occurring in intvec v
   int p = printlevel-voice+3;  // p=printlevel+1 (default: p=1)
   // --------------- Variante mit sres
@@ -810 +809 @@
   intmat Be;
   int s = size(v);
-  intvec v1 = sort(v)[1];
-  max = v1[s];                    // the maximum integer occurring in intvec v
+  max = Max(v);                   // the maximum integer occurring in intvec v
   int p = printlevel-voice+3;     // p=printlevel+1 (default: p=1)
 //---------- test: coker(N)=basering, coker(N)=0 ? ----------------------------
@@ -1294 +1292 @@
   intmat Be;
   int s = size(v);
-  intvec v1 = sort(v)[1];
-  max = v1[s];                   // maximum integer occurring in intvec v
+  max = Max(v);                  // maximum integer occurring in intvec v
   int p = printlevel-voice+3;    // p=printlevel+1 (default: p=1)
 
@@ -1929 +1926 @@
 }
 
+// taken from qhmoduli.lib
+static proc Max(data)
+"USAGE:   Max(data); intvec/list of integers
+PURPOSE: find the maximal integer contained in 'data'
+RETURN:  list
+ASSUME:  'data' contians only integers and is not empty
+"
+{
+  int i;
+  int max = data[1];
+
+  for(i = size(data); i>1;i--)
+  {
+    if(data[i] > max) { max = data[i]; }
+  }
+  return(max);
+}
+example
+{"EXAMPLE:";  echo = 2;
+  Max(list(1,2,3));
+}