Changeset b4ee8d in git

Timestamp:

Nov 27, 2017, 3:35:27 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5482cda1add93a178960d9c5cb78caabd603c0fc

Parents:

927cae09bf14e3dc0a1f6d1af5bfc39a666fd51f

Message:

Fix indentation

File:

• Singular/LIB/fpadim.lib (modified) (1 diff)

Singular/LIB/fpadim.lib

@@ -1243 +1243 @@
     if (G[v,w] == 1) {
       if (visited[w] == 1) {
-        // new cycle
-        if (v == w) {
-          for (int u = 1; u <= ncols(G); u++) {
-            if (G[v,u] && u != v) {
-              outFlag = 2;
-            }
-            if (G[u,v] && u != v) {
-              inFlag = 1;
-            }
-          }
-        } else {
-          for (int i = size(path); i >= 1; i--) { // for each vertex in the path
-            // check for neighbors not directly next or prev in cycle
-            for (int u = 1; u <= ncols(G); u++) {
-              if (G[path[i],u] == 1) { // there is an edge to u
-                if (path[i] != v) {
-                  if (u != path[i+1]) { // and u is not the next element in the cycle
-                    outFlag = 2;
-                  }
-                } else {
-                  if (u != w) {
-                    outFlag = 2;
-                  }
-                }
-              }
-              if (G[u,path[i]] == 1) { // there is an edge from u
-                if (path[i] != w) {
-                  if (u != path[i-1]) { // and u is not the previous element in the cylce
-                    inFlag = 1;
-                  }
-                } else {
-                  if (u != v) {
-                    inFlag = 1;
-                  }
-                }
-              }
-            }
-            if (path[i] == w) {
-              break;
-            }
-          }
-        }
+        // new cycle
+        if (v == w) {
+          for (int u = 1; u <= ncols(G); u++) {
+            if (G[v,u] && u != v) {
+              outFlag = 2;
+            }
+            if (G[u,v] && u != v) {
+              inFlag = 1;
+            }
+          }
+        } else {
+          for (int i = size(path); i >= 1; i--) { // for each vertex in the path
+            // check for neighbors not directly next or prev in cycle
+            for (int u = 1; u <= ncols(G); u++) {
+              if (G[path[i],u] == 1) { // there is an edge to u
+                if (path[i] != v) {
+                  if (u != path[i+1]) { // and u is not the next element in the cycle
+                    outFlag = 2;
+                  }
+                } else {
+                  if (u != w) {
+                    outFlag = 2;
+                  }
+                }
+              }
+              if (G[u,path[i]] == 1) { // there is an edge from u
+                if (path[i] != w) {
+                  if (u != path[i-1]) { // and u is not the previous element in the cylce
+                    inFlag = 1;
+                  }
+                } else {
+                  if (u != v) {
+                    inFlag = 1;
+                  }
+                }
+              }
+            }
+            if (path[i] == w) {
+              break;
+            }
+          }
+        }
       } else {
-        int inOutFlags = inOrOutCommingEdgeInCycle(G, w, visited, path);
-        if (inOutFlags == 1) {
-          inFlag = 1;
-        }
-        if (inOutFlags == 2) {
-          outFlag = 2;
-        }
-        if (inOutFlags == 3) {
-          inFlag = 1;
-          outFlag = 2;
-        }
+        int inOutFlags = inOrOutCommingEdgeInCycle(G, w, visited, path);
+        if (inOutFlags == 1) {
+          inFlag = 1;
+        }
+        if (inOutFlags == 2) {
+          outFlag = 2;
+        }
+        if (inOutFlags == 3) {
+          inFlag = 1;
+          outFlag = 2;
+        }
       }
     }