From 72b90ad181e4838c0dd2a7ea2f33b69eeac1c3ba Mon Sep 17 00:00:00 2001 From: nvcleemp Date: Mon, 15 Jun 2020 19:07:11 +0200 Subject: [PATCH 1/3] Reorganised examples --- .../abs_determinant_lower_bound_conjectures1.py | 0 .../abs_determinant_lower_bound_conjectures2.py | 0 .../abs_determinant_upper_bound_conjectures1.py | 0 .../determinant_lower_bound_conjectures.py | 0 .../determinant_upper_bound_conjectures1.py | 0 .../determinant_upper_bound_conjectures2.py | 0 .../domination_lower_bound_conjectures.py | 0 .../domination_upper_bound_conjectures1.py | 0 .../domination_upper_bound_conjectures2-long.py | 0 .../domination_upper_bound_conjectures2.py | 0 .../domination_upper_bound_conjectures3-long.py | 0 .../domination_upper_bound_conjectures3.py | 0 .../{ => Automated-Conjecturing-I}/goldbach_conjectures1-long.py | 0 examples/{ => Automated-Conjecturing-I}/goldbach_conjectures1.py | 0 .../{ => Automated-Conjecturing-I}/goldbach_conjectures2-long.py | 0 examples/{ => Automated-Conjecturing-I}/goldbach_conjectures2.py | 0 .../{ => Automated-Conjecturing-I}/prime_pi_conjectures1-long.py | 0 examples/{ => Automated-Conjecturing-I}/prime_pi_conjectures1.py | 0 .../{ => Automated-Conjecturing-I}/riemann_conjectures1-long.py | 0 examples/{ => Automated-Conjecturing-I}/riemann_conjectures1.py | 0 .../gravitational_experimentsFinal.sage.py | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.Rmd | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.html | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.out | 0 .../{rvatech_2020 => Learning-from-Data-2020}/gravityTestData.csv | 0 .../gravityTrainData.csv | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/realEstate.out | 0 .../{rvatech_2020 => Learning-from-Data-2020}/real_estate.Rmd | 0 .../{rvatech_2020 => Learning-from-Data-2020}/real_estate.html | 0 .../real_estate_price_investigationFinal.sage.py | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/testData.csv | 0 examples/{rvatech_2020 => Learning-from-Data-2020}/trainData.csv | 0 32 files changed, 0 insertions(+), 0 deletions(-) rename examples/{ => Automated-Conjecturing-I}/abs_determinant_lower_bound_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/abs_determinant_lower_bound_conjectures2.py (100%) rename examples/{ => Automated-Conjecturing-I}/abs_determinant_upper_bound_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/determinant_lower_bound_conjectures.py (100%) rename examples/{ => Automated-Conjecturing-I}/determinant_upper_bound_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/determinant_upper_bound_conjectures2.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_lower_bound_conjectures.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_upper_bound_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_upper_bound_conjectures2-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_upper_bound_conjectures2.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_upper_bound_conjectures3-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/domination_upper_bound_conjectures3.py (100%) rename examples/{ => Automated-Conjecturing-I}/goldbach_conjectures1-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/goldbach_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/goldbach_conjectures2-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/goldbach_conjectures2.py (100%) rename examples/{ => Automated-Conjecturing-I}/prime_pi_conjectures1-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/prime_pi_conjectures1.py (100%) rename examples/{ => Automated-Conjecturing-I}/riemann_conjectures1-long.py (100%) rename examples/{ => Automated-Conjecturing-I}/riemann_conjectures1.py (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravitational_experimentsFinal.sage.py (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.Rmd (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.html (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravity.out (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravityTestData.csv (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/gravityTrainData.csv (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/realEstate.out (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/real_estate.Rmd (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/real_estate.html (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/real_estate_price_investigationFinal.sage.py (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/testData.csv (100%) rename examples/{rvatech_2020 => Learning-from-Data-2020}/trainData.csv (100%) 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 From b37c5fbc320b8515caffae7f614499e36f9e8695 Mon Sep 17 00:00:00 2001 From: nvcleemp Date: Wed, 8 Jul 2020 12:02:50 +0200 Subject: [PATCH 2/3] Flush stdin before attempting to read from stderr. Fixes #17 --- sage/conjecturing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sage/conjecturing.py b/sage/conjecturing.py index 01ef8c8..8b14c9a 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 From f33151de32f92997668455451979d54c3f365d14 Mon Sep 17 00:00:00 2001 From: nvcleemp Date: Wed, 8 Jul 2020 14:12:24 +0200 Subject: [PATCH 3/3] Upgrading to version 0.13 We're not superstitious! --- spkg/README.md | 2 +- spkg/conjecturing/package-version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spkg/README.md b/spkg/README.md index 19066b5..872be1c 100644 --- a/spkg/README.md +++ b/spkg/README.md @@ -8,7 +8,7 @@ conjecturing. In case this is the system installation of Sage, you can find the location using the command `which`. * Copy the directory conjecturing into the directory SAGE_ROOT/build/pkgs. - * Copy the file conjecturing-0.12.tar.gz into SAGE_ROOT/upstream. + * Copy the file conjecturing-0.13.tar.gz into SAGE_ROOT/upstream. * Run the following command: $ sage --package fix-checksum conjecturing * Install the package using the following command: diff --git a/spkg/conjecturing/package-version.txt b/spkg/conjecturing/package-version.txt index c43e105..f304084 100644 --- a/spkg/conjecturing/package-version.txt +++ b/spkg/conjecturing/package-version.txt @@ -1 +1 @@ -0.12 +0.13