Merge pull request #109 from SriramGDev/sage-file-interface

Sage file interface bug fixes
algebraic-solving · Dec 15, 2023 · 15c433b · 15c433b
2 parents 470e939 + fbce883
commit 15c433b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/interfaces/msolve-to-sage-file-interface.sage b/interfaces/msolve-to-sage-file-interface.sage
@@ -76,16 +76,16 @@ def FormatOutputMSolve(foutput):
     # dimension
     dim = R[0]
     if dim > 0:
-        return A(-1), A(1), [], []
+        return None, None, A(-1), None, None, None, None
 
     # parametrization
     nvars       = R[1][1]
     qdim        = R[1][2]
     varstr      = R[1][3]
     linearform  = R[1][4]
-    elim        = R[1][5][1]
-    den         = R[1][5][2]
-    polys       = R[1][5][3]
+    elim        = R[1][5][1][0]
+    den         = R[1][5][1][1]
+    polys       = R[1][5][1][2]
     # solutions
     intervals   = R[2][1]
 
@@ -96,7 +96,7 @@ def FormatOutputMSolve(foutput):
     if len(elim) > 0:
         pelim = A(elim[1])
     else:
-        return A(-2), A(1), [], [], []
+        return None, None, A(-2), None, None, None, None
 
     pden, p, c = A(1), [], []
     if qdim > 0:

diff --git a/test/diff/diff_reals_dim0-chgvar.sh b/test/diff/diff_reals_dim0-chgvar.sh
@@ -13,28 +13,6 @@ if [ $? -gt 0 ]; then
     exit 2
 fi
 
-$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \
-      -p 256 -l 2 -t 1
-if [ $? -gt 0 ]; then
-    exit 3
-fi
-
-diff test/diff/$file.res output_files/$file.p256.res
-if [ $? -gt 0 ]; then
-    exit 4
-fi
-
-$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \
-      -p 256 -l 2 -t 2
-if [ $? -gt 0 ]; then
-    exit 5
-fi
-
-diff test/diff/$file.res output_files/$file.p256.res
-if [ $? -gt 0 ]; then
-    exit 6
-fi
-
 $(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res \
       -l 2 -t 2
 if [ $? -gt 0 ]; then