Changeset 3fc398 in git

Timestamp:

Sep 27, 2011, 5:09:53 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

e75eabc61db8b91ae3f58093334be6ae2f694691

Parents:

30a68478d0ec6f1ae5fc55c6907b025bedae4404

Message:

fix rootsur.lib: sturmha: reuires global ordering

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

File:

• Singular/LIB/rootsur.lib (modified) (7 diffs)

Singular/LIB/rootsur.lib

@@ -179 +179 @@
   lastsign = sign(l[1]);
 
-  for (int i = 1; i <= size(l); i = i + 1) {
-    if (sign(l[i]) != lastsign && sign(l[i]) != 0) {
+  for (int i = 1; i <= size(l); i++)
+  {
+    if (sign(l[i]) != lastsign && sign(l[i]) != 0)
+    {
       numberofchanges++;
       lastsign = sign(l[i]);
@@ -437 +439 @@
   maximum = 0;
 
-  for (i = 1; i <= size(monic); i = i + 1) {
+  for (i = 1; i <= size(monic); i++)
+  {
     maximum = max(abs(leadcoef(p[i])),maximum);
   }
@@ -624 +627 @@
   int result;
 
-  if (isparam(P) || isparam(a) || isparam(b)) {
-    ERROR("This procedure cannot operate with parametric arguments");
-  }
+  if (isparam(P) || isparam(a) || isparam(b))
+  { ERROR("This procedure cannot operate with parametric arguments"); }
+  if (!attrib(basering,"global"))
+  { ERROR("This procedure requires a global ordering"); }
 
   variable = isuni(P);
 
-  if (variable == 0) {
-    ERROR ("P must be a univariate polynomial");
-  }
-
-  if (a >= b) {
-    ERROR("a must be lower than b");
-  }
+  if (variable == 0) { ERROR ("P must be a univariate polynomial"); }
+
+  if (a >= b) { ERROR("a must be lower than b"); }
 
   if (subst(P,variable,a) == 0 || subst(P,variable,b) == 0) {
@@ -646 +646 @@
   bound = maxabs(P);
 
-  if (a < -bound) {
-    a = -bound;
-  }
-
-  if (b > bound) {
-    b = bound;
-  }
+  if (a < -bound) { a = -bound; }
+
+  if (b > bound) { b = bound; }
 
 //  if (a == -bound && b == bound) {
@@ -786 +782 @@
 EXAMPLE:   example nrroots; shows an example"
 {
-  if (isparam(p)) {
-    ERROR("This procedure cannot operate with parametric arguments");
-  }
+  if (isparam(p))
+  { ERROR("This procedure cannot operate with parametric arguments"); }
 
   number a = maxabs(p);
@@ -916 +911 @@
   result = 0;
 
-  while (i + dir >= 0 && i + dir <= size(l) + 1 && !result) {
-    if (l[i] == element) {
-      result = i;
-    }
+  while (i + dir >= 0 && i + dir <= size(l) + 1 && !result)
+  {
+    if (l[i] == element) { result = i; }
     i = i + dir;
   }
@@ -934 +928 @@
   result = 0;
 
-  while (i + dir >= 0 && i + dir <= size(l) + 1 && !result) {
-    if (l[i] != element) {
-      result = i;
-    }
+  while (i + dir >= 0 && i + dir <= size(l) + 1 && !result)
+  {
+    if (l[i] != element) { result = i; }
     i = i + dir;
   }