diff --git a/examples/abs_determinant_lower_bound_conjectures1.py b/examples/Automated-Conjecturing-I/abs_determinant_lower_bound_conjectures1.py similarity index 100% rename from examples/abs_determinant_lower_bound_conjectures1.py rename to examples/Automated-Conjecturing-I/abs_determinant_lower_bound_conjectures1.py diff --git a/examples/abs_determinant_lower_bound_conjectures2.py b/examples/Automated-Conjecturing-I/abs_determinant_lower_bound_conjectures2.py similarity index 100% rename from examples/abs_determinant_lower_bound_conjectures2.py rename to examples/Automated-Conjecturing-I/abs_determinant_lower_bound_conjectures2.py diff --git a/examples/abs_determinant_upper_bound_conjectures1.py b/examples/Automated-Conjecturing-I/abs_determinant_upper_bound_conjectures1.py similarity index 100% rename from examples/abs_determinant_upper_bound_conjectures1.py rename to examples/Automated-Conjecturing-I/abs_determinant_upper_bound_conjectures1.py diff --git a/examples/determinant_lower_bound_conjectures.py b/examples/Automated-Conjecturing-I/determinant_lower_bound_conjectures.py similarity index 100% rename from examples/determinant_lower_bound_conjectures.py rename to examples/Automated-Conjecturing-I/determinant_lower_bound_conjectures.py diff --git a/examples/determinant_upper_bound_conjectures1.py b/examples/Automated-Conjecturing-I/determinant_upper_bound_conjectures1.py similarity index 100% rename from examples/determinant_upper_bound_conjectures1.py rename to examples/Automated-Conjecturing-I/determinant_upper_bound_conjectures1.py diff --git a/examples/determinant_upper_bound_conjectures2.py b/examples/Automated-Conjecturing-I/determinant_upper_bound_conjectures2.py similarity index 100% rename from examples/determinant_upper_bound_conjectures2.py rename to examples/Automated-Conjecturing-I/determinant_upper_bound_conjectures2.py diff --git a/examples/domination_lower_bound_conjectures.py b/examples/Automated-Conjecturing-I/domination_lower_bound_conjectures.py similarity index 100% rename from examples/domination_lower_bound_conjectures.py rename to examples/Automated-Conjecturing-I/domination_lower_bound_conjectures.py diff --git a/examples/domination_upper_bound_conjectures1.py b/examples/Automated-Conjecturing-I/domination_upper_bound_conjectures1.py similarity index 100% rename from examples/domination_upper_bound_conjectures1.py rename to examples/Automated-Conjecturing-I/domination_upper_bound_conjectures1.py diff --git a/examples/domination_upper_bound_conjectures2-long.py b/examples/Automated-Conjecturing-I/domination_upper_bound_conjectures2-long.py similarity index 100% rename from examples/domination_upper_bound_conjectures2-long.py rename to examples/Automated-Conjecturing-I/domination_upper_bound_conjectures2-long.py diff --git a/examples/domination_upper_bound_conjectures2.py b/examples/Automated-Conjecturing-I/domination_upper_bound_conjectures2.py similarity index 100% rename from examples/domination_upper_bound_conjectures2.py rename to examples/Automated-Conjecturing-I/domination_upper_bound_conjectures2.py diff --git a/examples/domination_upper_bound_conjectures3-long.py b/examples/Automated-Conjecturing-I/domination_upper_bound_conjectures3-long.py similarity index 100% rename from examples/domination_upper_bound_conjectures3-long.py rename to examples/Automated-Conjecturing-I/domination_upper_bound_conjectures3-long.py diff --git a/examples/domination_upper_bound_conjectures3.py b/examples/Automated-Conjecturing-I/domination_upper_bound_conjectures3.py similarity index 100% rename from examples/domination_upper_bound_conjectures3.py rename to examples/Automated-Conjecturing-I/domination_upper_bound_conjectures3.py diff --git a/examples/goldbach_conjectures1-long.py b/examples/Automated-Conjecturing-I/goldbach_conjectures1-long.py similarity index 100% rename from examples/goldbach_conjectures1-long.py rename to examples/Automated-Conjecturing-I/goldbach_conjectures1-long.py diff --git a/examples/goldbach_conjectures1.py b/examples/Automated-Conjecturing-I/goldbach_conjectures1.py similarity index 100% rename from examples/goldbach_conjectures1.py rename to examples/Automated-Conjecturing-I/goldbach_conjectures1.py diff --git a/examples/goldbach_conjectures2-long.py b/examples/Automated-Conjecturing-I/goldbach_conjectures2-long.py similarity index 100% rename from examples/goldbach_conjectures2-long.py rename to examples/Automated-Conjecturing-I/goldbach_conjectures2-long.py diff --git a/examples/goldbach_conjectures2.py b/examples/Automated-Conjecturing-I/goldbach_conjectures2.py similarity index 100% rename from examples/goldbach_conjectures2.py rename to examples/Automated-Conjecturing-I/goldbach_conjectures2.py diff --git a/examples/prime_pi_conjectures1-long.py b/examples/Automated-Conjecturing-I/prime_pi_conjectures1-long.py similarity index 100% rename from examples/prime_pi_conjectures1-long.py rename to examples/Automated-Conjecturing-I/prime_pi_conjectures1-long.py diff --git a/examples/prime_pi_conjectures1.py b/examples/Automated-Conjecturing-I/prime_pi_conjectures1.py similarity index 100% rename from examples/prime_pi_conjectures1.py rename to examples/Automated-Conjecturing-I/prime_pi_conjectures1.py diff --git a/examples/riemann_conjectures1-long.py b/examples/Automated-Conjecturing-I/riemann_conjectures1-long.py similarity index 100% rename from examples/riemann_conjectures1-long.py rename to examples/Automated-Conjecturing-I/riemann_conjectures1-long.py diff --git a/examples/riemann_conjectures1.py b/examples/Automated-Conjecturing-I/riemann_conjectures1.py similarity index 100% rename from examples/riemann_conjectures1.py rename to examples/Automated-Conjecturing-I/riemann_conjectures1.py diff --git a/examples/rvatech_2020/gravitational_experimentsFinal.sage.py b/examples/Learning-from-Data-2020/gravitational_experimentsFinal.sage.py similarity index 100% rename from examples/rvatech_2020/gravitational_experimentsFinal.sage.py rename to examples/Learning-from-Data-2020/gravitational_experimentsFinal.sage.py diff --git a/examples/rvatech_2020/gravity.Rmd b/examples/Learning-from-Data-2020/gravity.Rmd similarity index 100% rename from examples/rvatech_2020/gravity.Rmd rename to examples/Learning-from-Data-2020/gravity.Rmd diff --git a/examples/rvatech_2020/gravity.html b/examples/Learning-from-Data-2020/gravity.html similarity index 100% rename from examples/rvatech_2020/gravity.html rename to examples/Learning-from-Data-2020/gravity.html diff --git a/examples/rvatech_2020/gravity.out b/examples/Learning-from-Data-2020/gravity.out similarity index 100% rename from examples/rvatech_2020/gravity.out rename to examples/Learning-from-Data-2020/gravity.out diff --git a/examples/rvatech_2020/gravityTestData.csv b/examples/Learning-from-Data-2020/gravityTestData.csv similarity index 100% rename from examples/rvatech_2020/gravityTestData.csv rename to examples/Learning-from-Data-2020/gravityTestData.csv diff --git a/examples/rvatech_2020/gravityTrainData.csv b/examples/Learning-from-Data-2020/gravityTrainData.csv similarity index 100% rename from examples/rvatech_2020/gravityTrainData.csv rename to examples/Learning-from-Data-2020/gravityTrainData.csv diff --git a/examples/rvatech_2020/realEstate.out b/examples/Learning-from-Data-2020/realEstate.out similarity index 100% rename from examples/rvatech_2020/realEstate.out rename to examples/Learning-from-Data-2020/realEstate.out diff --git a/examples/rvatech_2020/real_estate.Rmd b/examples/Learning-from-Data-2020/real_estate.Rmd similarity index 100% rename from examples/rvatech_2020/real_estate.Rmd rename to examples/Learning-from-Data-2020/real_estate.Rmd diff --git a/examples/rvatech_2020/real_estate.html b/examples/Learning-from-Data-2020/real_estate.html similarity index 100% rename from examples/rvatech_2020/real_estate.html rename to examples/Learning-from-Data-2020/real_estate.html diff --git a/examples/rvatech_2020/real_estate_price_investigationFinal.sage.py b/examples/Learning-from-Data-2020/real_estate_price_investigationFinal.sage.py similarity index 100% rename from examples/rvatech_2020/real_estate_price_investigationFinal.sage.py rename to examples/Learning-from-Data-2020/real_estate_price_investigationFinal.sage.py diff --git a/examples/rvatech_2020/testData.csv b/examples/Learning-from-Data-2020/testData.csv similarity index 100% rename from examples/rvatech_2020/testData.csv rename to examples/Learning-from-Data-2020/testData.csv diff --git a/examples/rvatech_2020/trainData.csv b/examples/Learning-from-Data-2020/trainData.csv similarity index 100% rename from examples/rvatech_2020/trainData.csv rename to examples/Learning-from-Data-2020/trainData.csv diff --git a/sage/conjecturing.py b/sage/conjecturing.py index 76d5e10..29ca656 100644 --- a/sage/conjecturing.py +++ b/sage/conjecturing.py @@ -460,6 +460,8 @@ def get_value(invariant, o): except: stdin.write('NaN\n') + stdin.flush() + if verbose: print("Finished computing and writing invariant values to expressions") @@ -467,8 +469,6 @@ def get_value(invariant, o): for l in sp.stderr: print('> ' + l.rstrip()) - stdin.flush() - # process the output out = sp.stdout @@ -761,6 +761,8 @@ def get_value(prop, o): except: stdin.write('-1\n') + stdin.flush() + if verbose: print("Finished computing and writing property values to expressions") @@ -768,8 +770,6 @@ def get_value(prop, o): for l in sp.stderr: print('> ' + l.rstrip()) - stdin.flush() - # process the output out = sp.stdout