diff --git a/examples/165_stellenwerttafel.html b/examples/165_stellenwerttafel.html new file mode 100644 index 000000000..32719fe55 --- /dev/null +++ b/examples/165_stellenwerttafel.html @@ -0,0 +1,390 @@ + + + + + + Stellenwerttafel-Tausendstel.cdy + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/js/libcs/Operators.js b/src/js/libcs/Operators.js index b89d1a3d0..0bcb02b89 100644 --- a/src/js/libcs/Operators.js +++ b/src/js/libcs/Operators.js @@ -36,7 +36,7 @@ import { evaluate, printStackTrace, evaluateAndVal, evaluateAndHomog, analyse } import { CSad } from "libcs/CSad"; import { tools, setActiveTool } from "libcs/Tools"; import { csport, csgstorage } from "libgeo/GeoState"; -import { addElement, removeElement } from "libgeo/GeoBasics"; +import { addElement, removeElement, addElementNoProof } from "libgeo/GeoBasics"; import { stateContinueFromHere } from "libgeo/Tracing"; import { geoOps, geoAliases, geoMacros } from "libgeo/GeoOps"; import { masses, springs } from "liblab/LabBasics"; @@ -4156,7 +4156,7 @@ evaluator.createpoint$2 = function (args, modifs) { return { ctype: "geo", - value: addElement(el, true), + value: addElementNoProof(el), }; }; diff --git a/src/js/libgeo/GeoBasics.js b/src/js/libgeo/GeoBasics.js index acf61521b..7f4a69f29 100644 --- a/src/js/libgeo/GeoBasics.js +++ b/src/js/libgeo/GeoBasics.js @@ -92,7 +92,16 @@ function csinit(gslp) { conics: [], }; - gslp.forEach(addElementNoProof); + gslp.forEach((el, index) => { + addElementNoProof(el); + try { + // only check incidences, there should be not duplicates when loading a construciton + guessIncidences(el); + } catch (e) { + console.error(e); + } + }); + checkConjectures(); } @@ -173,6 +182,15 @@ function polygonDefault(el) { function addElement(el, removeDuplicates) { el = addElementNoProof(el); + // Guess Duplicates and Incidences + // use try/catch since this is not mission critical + try { + guessDuplicate(el); + guessIncidences(el); + } catch (e) { + console.error(e); + } + checkConjectures(); // remove element if it's a proven duplicate @@ -370,14 +388,6 @@ function addElementNoProof(el) { isShowing(el, op); geoDependantsCache = {}; - // Guess Duplicates and Incidences - // use try/catch since this is not mission critical - try { - guessDuplicate(el); - guessIncidences(el); - } catch (e) { - console.error(e); - } return csgeo.csnames[el.name]; }