Changeset 2ceb9f in git

Timestamp:

Jan 3, 2018, 4:53:24 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

cd41db8bc95c947e9ebfa6c7ca4b3c40724b3dae

Parents:

fe531eadd6a60326faa28de0110effd5ec71438c

Message:

fix: Olga::locStatus

File:

• Singular/LIB/olga.lib (modified) (3 diffs)

Singular/LIB/olga.lib

@@ -153 +153 @@
           + " locData has to be defined"));
     }
-    if (locType == 0) { // monoidal localizations
-        if (t != "list") {
+    if (locType == 0)
+    { // monoidal localizations
+        if (t != "list")
+        {
             return(list(0, "for a monoidal localization, locData has to be of"
               + " type list, but is of type " + t));
-        } else { // locData is of type list
-            if (size(locData) == 0) {
+        }
+        else
+        { // locData is of type list
+            if (size(locData) == 0)
+            {
                 return(list(0, "for a monoidal localization, locData has to be"
                   + " a non-empty list"));
-            } else { // locData is of type list and has at least one entry
-                ideal listEntries;
-                for (i = 1; i <= size(locData); i++) {
+            }
+            else
+            { // locData is of type list and has at least one entry
+                if (defined(basering)) {ideal listEntries;}
+                for (i = 1; i <= size(locData); i++)
+                {
                     t = typeof(locData[i]);
-                    if (t != "poly" && t != "int" && t != "number") {
+                    if (t != "poly" && t != "int" && t != "number")
+                    {
                         return(list(0, "for a monoidal localization, locData"
                           + " has to be a list of polys, ints or numbers, but"
                           + " entry " + string(i) + " is " + string(locData[i])
                           + ", which is of type " + t));
-                    } else {
-                        if (listEntries == 0) {
+                    }
+                    else
+                    {
+                      if (defined(basering))
+                      {
+                        if (size(listEntries) == 0)
+                        {
                             listEntries = locData[i];
-                        } else {
+                        }
+                        else
+                        {
                             listEntries = listEntries, locData[i];
                         }
+                      }
                     }
                 }
                 // locData is of type list, has at least one entry and all
                 //   entries are polys
-                if (!inducesCommutativeSubring(listEntries)) {
+                if (!defined(basering))
+                {
                     return(list(0, "for a monoidal localization, the variables"
                       + " occurring in the polys in locData have to induce a"
                       + " commutative polynomial subring of basering"));
                 }
-            }
-        }
-    }
-    if (locType == 1) { // geometric localizations
+                if (!inducesCommutativeSubring(listEntries))
+                {
+                    return(list(0, "for a monoidal localization, the variables"
+                      + " occurring in the polys in locData have to induce a"
+                      + " commutative polynomial subring of basering"));
+                }
+            }
+        }
+    }
+    if (locType == 1)
+    { // geometric localizations
         int n = nvars(basering) div 2;
-        if (2*n != nvars(basering)) {
+        if (2*n != nvars(basering))
+        {
             return(list(0, "for a geometric localization, basering has to have"
               + " an even number of variables"));
-        } else {
+        }
+        else
+        {
             int j;
-            for (i = 1; i <= n; i++) {
-                for (j = i + 1; j <= n; j++) {
-                    if (var(i)*var(j) != var(j)*var(i)) {
+            for (i = 1; i <= n; i++)
+            {
+                for (j = i + 1; j <= n; j++)
+                {
+                    if (var(i)*var(j) != var(j)*var(i))
+                    {
                         return(list(0, "for a geometric localization, the"
                           + " first half of the variables of basering has to"
@@ -206 +237 @@
             }
         }
-        if (t != "ideal") {
+        if (t != "ideal")
+        {
             return(list(0, "for a geometric localization, locData has to be of"
               + " type ideal, but is of type " + t));
         }
-        for (i = 1; i <= size(locData); i++) {
-            if (!polyVars(locData[i],1..n)) {
+        for (i = 1; i <= size(locData); i++)
+        {
+            if (!polyVars(locData[i],1..n))
+            {
                 return(list(0, "for a geometric localization, locData has to"
                 + " be an ideal generated by polynomials containing only"
@@ -218 +252 @@
         }
     }
-    if (locType == 2) { // rational localizations
-        if (t != "intvec") {
+    if (locType == 2)
+    { // rational localizations
+        if (t != "intvec")
+        {
             return(list(0, "for a rational localization, locData has to be of"
               + " type intvec, but is of type " + t));
-        } else { // locData is of type intvec
-            if(locData == 0) {
+        }
+        else
+        { // locData is of type intvec
+            if(locData == 0)
+            {
                 return(list(0, "for a rational localization, locData has to be"
                   + " a non-zero intvec"));
-            } else { // locData is of type intvec and not zero
-                if (!admissibleSub(locData)) {
+            }
+            else
+            { // locData is of type intvec and not zero
+                if (!admissibleSub(locData))
+                {
                     return(list(0, "for a rational localization, the variables"
                       + " indexed by locData have to generate a sub-G-algebra"