Repository navigation
Integrate the OCR sigma and summation fixes onto main - #2
Merged
Merged
Conversation
Lift CoMER scores when an over-arrow, summation, or Greek name agrees with the ink, and leave weaker scores as ink. Accept \sum_{i=1}^{n} i as notation so the card does not turn red.
Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 58c5c74 onto this branch: Ceva, Menelaus, Stewart, Van Obel, Apollonius, line-sphere, Descartes, Euler line, cylinder sections, radical center, Varignon, and Viviani. Keep the sheet's summation and Greek-name reading where the OCR sides overlapped. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 13b4e80 onto this branch. Add Ptolemy, Brahmagupta, Napoleon, the sphere common chord, Morley, Carnot, the separate Euler |OH|^2 form, and isogonal pairs. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at de22a9b onto this branch. Add the Simson line, the trilinear polar of the incenter, the OH diameter of the nine-point circle in a right triangle, and Cayley-Menger volume from the six edges. Co-authored-by: DNT_OF <allowcache@gmail.com>
A lone loop-and-tail is σ when the model says 0, Y, or u and the score is already in the agree band. A closed zero, a bowl, a fork, and a line of writing stay put. The name sigma is the letter, not the graph of y = sigma. The ink gate and auto-write path are unchanged. Co-authored-by: DNT_OF <allowcache@gmail.com>
Take box/mathscrap-vanobel-line-sphere-20261101 at cf2767f for the shared over-arrow, sum, and isolated-sigma reading. Drop the parallel sigma module. Geometry through Simson and Cayley-Menger stays. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 58201bc onto this branch. A complete quadrilateral reports its Miquel point, two perspective triangles report the Desargues center and axis, and cylinder and cone sections report eccentricity. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 851bf13 onto this branch. A cyclic hexagon reports its Pascal line, a tangential hexagon reports the Brianchon point, a tetrahedron lists face areas and altitudes, and a point reflects across a line or a plane. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 653db41 onto this branch. The nine-point circle reports its distances to the incircle and the excircles, and the triangle reports the Spieker center and the Nagel point on the Nagel line. Co-authored-by: DNT_OF <allowcache@gmail.com>
The glyph check was dropped when the confident sigma lift landed. A mid-confidence 0, Y, or u is rewritten only when the ink is an open sigma; a closed zero, a bowl, a fork, and y = 0 stay as read.
Bring box/mathscrap-vanobel-line-sphere-20261101 at d1af288 onto this branch. A triangle reports the Gergonne point, the Lemoine symmedian point, and the two Brocard points with cot ω. Co-authored-by: DNT_OF <allowcache@gmail.com>
The branch tip already rewrote a mid-confidence 0, Y, or u when the ink is an open sigma. Keep that reading beside the Gergonne, Lemoine, and Brocard facts. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at e2c5c60 onto this branch. L is the reflection of H through O, Mi is the mittenpunkt, and Sc is where the Euler lines of ABC and IBC meet. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at 2574251 onto this branch. Be is the reflection of I through O, the altitude feet form the orthic triangle on the nine-point circle, and an acute triangle reports the Euler reflection point on the circumcircle. Co-authored-by: DNT_OF <allowcache@gmail.com>
Bring box/mathscrap-vanobel-line-sphere-20261101 at e3459c0 onto this branch. The Apollonian circles meet at the isodynamic points S1 and S2. St is the fourth intersection of the circumcircle and the Steiner ellipse, and Ty is its antipode on the circumcircle. Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
…ngle isogonals Co-authored-by: DNT_OF <allowcache@gmail.com>
Co-authored-by: DNT_OF <allowcache@gmail.com>
Keep main's geometry, WASM, logarithms, bilingual UI, packaging, and CI. The merge had inserted a second copy of the X(91)/X(92) block already on main; that duplicate is removed so each center is emitted once. Keep the OCR fixes that main did not have: an isolated sigma misread as 0, Y, or u is rewritten only when the ink matches, and summation bars are not treated as an over-arrow. Vite resolves the source alias with import.meta.dirname. Pushes to main run the same test job; installer jobs still run only after that job, and only on push. Co-authored-by: DNT_OF <allowcache@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merge keeps both histories. The head descends from current
main(de082509bf4b43fb813f03bb1d9dbc55598c3f4a) and from the OCR tip (d7ac9aa10f8ba0d73f74a5ee25590eb8c864357f). Author DNT_OF / DNTOF. Apache-2.0 and NOTICE are unchanged.What was unique on the OCR branch
Most of the 37 commits were older geometry merges. Current
mainalready contains the later centers, including X(91) and X(92). The merge inserted a second copy of that block; the duplicate was removed so each center is emitted once.crates/mathcore/src/geometry.rsand the rebuilt WASM match that single copy. Newer geometry was not rolled back.The OCR changes that
maindid not already have are kept:0,Y, oruis rewritten tosigmaonly when the ink matches. A formula, a closed 0, a u-shaped bowl, and a Y fork are left alone.Also in this head
vite.config.tsresolvessrcwithimport.meta.dirname. Node 22 provides it, and the production build no longer warns about__dirname..github/workflows/package.ymlnow runs on a push tomainas well ascursor/mathscrap-packaging-*and on a pull request intomain. Thetestjob has no skip condition, so a push tomainruns lint, Rust, smoke, OCR, AI, pack checks, sheet e2e, and per-formula e2e. The web bundle, debug APK, and unsigned Windows installer still build only on a push, and only aftertestpasses. A pull request does not build installers.npm run test:pack. The file stays one bilingual document, Chinese paragraph then English.Checks run locally
Rust 135 passed. Formula smoke 115/115 and shared-sheet 20/20. OCR smoke, AI/MCP smoke,
npm run test:pack, andnpm run pack:webpassed. Sheet e2e passed. Per-formula e2e was desktop 113/113 and phone 14/14. The production bundle check passed and did not contain the dev-server bridge.Limits
Windows packages from the existing pipeline are unsigned. The Android package is debug-signed. No IPA was built, and these artifacts were not installed on a device. Longer geometric explanations that are not in the on-screen glossary can still appear in Chinese. The engine and MCP still return that Chinese wording. Handwriting stays local: text gate, explicit recognition, bundled CoMER, blank kraft sheet, and the corner plot.