Merge branch 'master' into CoCalc

nvcleemp · Jul 8, 2020 · a18e4d3 · a18e4d3
2 parents e400580 + f33151d
commit a18e4d3
Show file tree

Hide file tree

Showing 33 changed files with 4 additions and 4 deletions.
diff --git a/...s_determinant_lower_bound_conjectures1.py → ...s_determinant_lower_bound_conjectures1.py b/...s_determinant_lower_bound_conjectures1.py → ...s_determinant_lower_bound_conjectures1.py
diff --git a/...s_determinant_lower_bound_conjectures2.py → ...s_determinant_lower_bound_conjectures2.py b/...s_determinant_lower_bound_conjectures2.py → ...s_determinant_lower_bound_conjectures2.py
diff --git a/...s_determinant_upper_bound_conjectures1.py → ...s_determinant_upper_bound_conjectures1.py b/...s_determinant_upper_bound_conjectures1.py → ...s_determinant_upper_bound_conjectures1.py
diff --git a/...es/determinant_lower_bound_conjectures.py → ...-I/determinant_lower_bound_conjectures.py b/...es/determinant_lower_bound_conjectures.py → ...-I/determinant_lower_bound_conjectures.py
diff --git a/...s/determinant_upper_bound_conjectures1.py → ...I/determinant_upper_bound_conjectures1.py b/...s/determinant_upper_bound_conjectures1.py → ...I/determinant_upper_bound_conjectures1.py
diff --git a/...s/determinant_upper_bound_conjectures2.py → ...I/determinant_upper_bound_conjectures2.py b/...s/determinant_upper_bound_conjectures2.py → ...I/determinant_upper_bound_conjectures2.py
diff --git a/...les/domination_lower_bound_conjectures.py → ...g-I/domination_lower_bound_conjectures.py b/...les/domination_lower_bound_conjectures.py → ...g-I/domination_lower_bound_conjectures.py
diff --git a/...es/domination_upper_bound_conjectures1.py → ...-I/domination_upper_bound_conjectures1.py b/...es/domination_upper_bound_conjectures1.py → ...-I/domination_upper_bound_conjectures1.py
diff --git a/...mination_upper_bound_conjectures2-long.py → ...mination_upper_bound_conjectures2-long.py b/...mination_upper_bound_conjectures2-long.py → ...mination_upper_bound_conjectures2-long.py
diff --git a/...es/domination_upper_bound_conjectures2.py → ...-I/domination_upper_bound_conjectures2.py b/...es/domination_upper_bound_conjectures2.py → ...-I/domination_upper_bound_conjectures2.py
diff --git a/...mination_upper_bound_conjectures3-long.py → ...mination_upper_bound_conjectures3-long.py b/...mination_upper_bound_conjectures3-long.py → ...mination_upper_bound_conjectures3-long.py
diff --git a/...es/domination_upper_bound_conjectures3.py → ...-I/domination_upper_bound_conjectures3.py b/...es/domination_upper_bound_conjectures3.py → ...-I/domination_upper_bound_conjectures3.py
diff --git a/examples/goldbach_conjectures1-long.py → ...jecturing-I/goldbach_conjectures1-long.py b/examples/goldbach_conjectures1-long.py → ...jecturing-I/goldbach_conjectures1-long.py
diff --git a/examples/goldbach_conjectures1.py → ...d-Conjecturing-I/goldbach_conjectures1.py b/examples/goldbach_conjectures1.py → ...d-Conjecturing-I/goldbach_conjectures1.py
diff --git a/examples/goldbach_conjectures2-long.py → ...jecturing-I/goldbach_conjectures2-long.py b/examples/goldbach_conjectures2-long.py → ...jecturing-I/goldbach_conjectures2-long.py
diff --git a/examples/goldbach_conjectures2.py → ...d-Conjecturing-I/goldbach_conjectures2.py b/examples/goldbach_conjectures2.py → ...d-Conjecturing-I/goldbach_conjectures2.py
diff --git a/examples/prime_pi_conjectures1-long.py → ...jecturing-I/prime_pi_conjectures1-long.py b/examples/prime_pi_conjectures1-long.py → ...jecturing-I/prime_pi_conjectures1-long.py
diff --git a/examples/prime_pi_conjectures1.py → ...d-Conjecturing-I/prime_pi_conjectures1.py b/examples/prime_pi_conjectures1.py → ...d-Conjecturing-I/prime_pi_conjectures1.py
diff --git a/examples/riemann_conjectures1-long.py → ...njecturing-I/riemann_conjectures1-long.py b/examples/riemann_conjectures1-long.py → ...njecturing-I/riemann_conjectures1-long.py
diff --git a/examples/riemann_conjectures1.py → ...ed-Conjecturing-I/riemann_conjectures1.py b/examples/riemann_conjectures1.py → ...ed-Conjecturing-I/riemann_conjectures1.py
diff --git a/...20/gravitational_experimentsFinal.sage.py → ...20/gravitational_experimentsFinal.sage.py b/...20/gravitational_experimentsFinal.sage.py → ...20/gravitational_experimentsFinal.sage.py
diff --git a/examples/rvatech_2020/gravity.Rmd → examples/Learning-from-Data-2020/gravity.Rmd b/examples/rvatech_2020/gravity.Rmd → examples/Learning-from-Data-2020/gravity.Rmd
diff --git a/examples/rvatech_2020/gravity.html → ...ples/Learning-from-Data-2020/gravity.html b/examples/rvatech_2020/gravity.html → ...ples/Learning-from-Data-2020/gravity.html
diff --git a/examples/rvatech_2020/gravity.out → examples/Learning-from-Data-2020/gravity.out b/examples/rvatech_2020/gravity.out → examples/Learning-from-Data-2020/gravity.out
diff --git a/examples/rvatech_2020/gravityTestData.csv → ...arning-from-Data-2020/gravityTestData.csv b/examples/rvatech_2020/gravityTestData.csv → ...arning-from-Data-2020/gravityTestData.csv
diff --git a/examples/rvatech_2020/gravityTrainData.csv → ...rning-from-Data-2020/gravityTrainData.csv b/examples/rvatech_2020/gravityTrainData.csv → ...rning-from-Data-2020/gravityTrainData.csv
diff --git a/examples/rvatech_2020/realEstate.out → ...es/Learning-from-Data-2020/realEstate.out b/examples/rvatech_2020/realEstate.out → ...es/Learning-from-Data-2020/realEstate.out
diff --git a/examples/rvatech_2020/real_estate.Rmd → ...s/Learning-from-Data-2020/real_estate.Rmd b/examples/rvatech_2020/real_estate.Rmd → ...s/Learning-from-Data-2020/real_estate.Rmd
diff --git a/examples/rvatech_2020/real_estate.html → .../Learning-from-Data-2020/real_estate.html b/examples/rvatech_2020/real_estate.html → .../Learning-from-Data-2020/real_estate.html
diff --git a/...l_estate_price_investigationFinal.sage.py → ...l_estate_price_investigationFinal.sage.py b/...l_estate_price_investigationFinal.sage.py → ...l_estate_price_investigationFinal.sage.py
diff --git a/examples/rvatech_2020/testData.csv → ...ples/Learning-from-Data-2020/testData.csv b/examples/rvatech_2020/testData.csv → ...ples/Learning-from-Data-2020/testData.csv
diff --git a/examples/rvatech_2020/trainData.csv → ...les/Learning-from-Data-2020/trainData.csv b/examples/rvatech_2020/trainData.csv → ...les/Learning-from-Data-2020/trainData.csv
diff --git a/sage/conjecturing.py b/sage/conjecturing.py
@@ -460,15 +460,15 @@ def get_value(invariant, o):
             except:
                 stdin.write('NaN\n')
 
+    stdin.flush()
+
     if verbose:
         print("Finished computing and writing invariant values to expressions")
 
     if debug:
         for l in sp.stderr:
             print('> ' + l.rstrip())
 
-    stdin.flush()
-
     # process the output
     out = sp.stdout
 
@@ -761,15 +761,15 @@ def get_value(prop, o):
             except:
                 stdin.write('-1\n')
 
+    stdin.flush()
+
     if verbose:
         print("Finished computing and writing property values to expressions")
 
     if debug:
         for l in sp.stderr:
             print('> ' + l.rstrip())
 
-    stdin.flush()
-
     # process the output
     out = sp.stdout