From 3b30a54c8269e77d1c28477997223da1cd3a4748 Mon Sep 17 00:00:00 2001
From: Entkenntnis <Entkenntnis@users.noreply.github.com>
Date: Tue, 5 Dec 2023 14:55:05 +0100
Subject: [PATCH 1/4] make vereinfachen more generic

---
 .../equations-app/equations-app.tsx           | 58 +++++++++++++------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/components/equations-app/equations-app.tsx b/src/components/equations-app/equations-app.tsx
index 2edad62f73..0d12159cbb 100644
--- a/src/components/equations-app/equations-app.tsx
+++ b/src/components/equations-app/equations-app.tsx
@@ -23,6 +23,7 @@ type InputState =
   | 'var-mismatch'
   | 'left-mismatch'
   | 'right-mismatch'
+  | 'mismatch'
 
 export function EquationsApp() {
   const ce = new ComputeEngine()
@@ -103,6 +104,7 @@ export function EquationsApp() {
     return () => {
       window.removeEventListener('popstate', handlePopstate)
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   if (showOverview) {
@@ -527,7 +529,7 @@ export function EquationsApp() {
                     <div className="mb-2 flex items-baseline justify-between">
                       <div className="pt-3 text-base font-bold text-gray-700 ">
                         {actions[actions.length - 1].type === 'simplify'
-                          ? 'Terme in Gleichung vereinfachen:'
+                          ? 'Gleichung vereinfachen:'
                           : 'Forme auf beiden Seiten um:'}
                       </div>
                       <button
@@ -592,23 +594,40 @@ export function EquationsApp() {
                                   ce.assign(variableSymbol, i)
                                 }
 
-                                const termL = `( ${refLeft} ) - ( ${parts[0]} )`
-                                const valueL = safeParse(termL).N()
-                                  .value as number
-
-                                const termR = `( ${refRight} ) - ( ${parts[1]} )`
-                                const valueR = safeParse(termR).N()
-                                  .value as number
-
-                                // console.log(termL, valueL, '\n', termR, valueR)
-
-                                if (Math.abs(valueL) > 0.00001) {
-                                  setInputState('left-mismatch')
-                                  return
-                                }
-                                if (Math.abs(valueR) > 0.00001) {
-                                  setInputState('right-mismatch')
-                                  return
+                                const type = actions[actions.length - 1].type
+
+                                if (type === 'simplify') {
+                                  const termP = `( ${refLeft} ) - ( ${refRight} )`
+                                  const valueP = safeParse(termP).N()
+                                    .value as number
+
+                                  const term = `( ${parts[0]} ) - ( ${parts[1]} )`
+                                  const value = safeParse(term).N()
+                                    .value as number
+
+                                  if (Math.abs(valueP - value) > 0.0001) {
+                                    setInputState('mismatch')
+                                    return
+                                  }
+                                } else {
+                                  const termL = `( ${refLeft} ) - ( ${parts[0]} )`
+                                  const valueL = safeParse(termL).N()
+                                    .value as number
+
+                                  const termR = `( ${refRight} ) - ( ${parts[1]} )`
+                                  const valueR = safeParse(termR).N()
+                                    .value as number
+
+                                  // console.log(termL, valueL, '\n', termR, valueR)
+
+                                  if (Math.abs(valueL) > 0.00001) {
+                                    setInputState('left-mismatch')
+                                    return
+                                  }
+                                  if (Math.abs(valueR) > 0.00001) {
+                                    setInputState('right-mismatch')
+                                    return
+                                  }
                                 }
                                 //if (symbols.size == 0) break
                               }
@@ -653,6 +672,9 @@ export function EquationsApp() {
                       {inputState === 'var-mismatch' && (
                         <span>Variablen passen nicht</span>
                       )}
+                      {inputState === 'mismatch' && (
+                        <span>Vereinfachung nicht äquivalent</span>
+                      )}
                       {inputState === 'left-mismatch' && (
                         <span>
                           Term auf der linken Seite der Gleichung ist nicht

From 12d5ff6076b7e9305f890be4c6a6d120c2d0cc05 Mon Sep 17 00:00:00 2001
From: Entkenntnis <Entkenntnis@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:20:59 +0100
Subject: [PATCH 2/4] Revert "make vereinfachen more generic"

This reverts commit 3b30a54c8269e77d1c28477997223da1cd3a4748.
---
 .../equations-app/equations-app.tsx           | 58 ++++++-------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/src/components/equations-app/equations-app.tsx b/src/components/equations-app/equations-app.tsx
index 0d12159cbb..2edad62f73 100644
--- a/src/components/equations-app/equations-app.tsx
+++ b/src/components/equations-app/equations-app.tsx
@@ -23,7 +23,6 @@ type InputState =
   | 'var-mismatch'
   | 'left-mismatch'
   | 'right-mismatch'
-  | 'mismatch'
 
 export function EquationsApp() {
   const ce = new ComputeEngine()
@@ -104,7 +103,6 @@ export function EquationsApp() {
     return () => {
       window.removeEventListener('popstate', handlePopstate)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   if (showOverview) {
@@ -529,7 +527,7 @@ export function EquationsApp() {
                     <div className="mb-2 flex items-baseline justify-between">
                       <div className="pt-3 text-base font-bold text-gray-700 ">
                         {actions[actions.length - 1].type === 'simplify'
-                          ? 'Gleichung vereinfachen:'
+                          ? 'Terme in Gleichung vereinfachen:'
                           : 'Forme auf beiden Seiten um:'}
                       </div>
                       <button
@@ -594,40 +592,23 @@ export function EquationsApp() {
                                   ce.assign(variableSymbol, i)
                                 }
 
-                                const type = actions[actions.length - 1].type
-
-                                if (type === 'simplify') {
-                                  const termP = `( ${refLeft} ) - ( ${refRight} )`
-                                  const valueP = safeParse(termP).N()
-                                    .value as number
-
-                                  const term = `( ${parts[0]} ) - ( ${parts[1]} )`
-                                  const value = safeParse(term).N()
-                                    .value as number
-
-                                  if (Math.abs(valueP - value) > 0.0001) {
-                                    setInputState('mismatch')
-                                    return
-                                  }
-                                } else {
-                                  const termL = `( ${refLeft} ) - ( ${parts[0]} )`
-                                  const valueL = safeParse(termL).N()
-                                    .value as number
-
-                                  const termR = `( ${refRight} ) - ( ${parts[1]} )`
-                                  const valueR = safeParse(termR).N()
-                                    .value as number
-
-                                  // console.log(termL, valueL, '\n', termR, valueR)
-
-                                  if (Math.abs(valueL) > 0.00001) {
-                                    setInputState('left-mismatch')
-                                    return
-                                  }
-                                  if (Math.abs(valueR) > 0.00001) {
-                                    setInputState('right-mismatch')
-                                    return
-                                  }
+                                const termL = `( ${refLeft} ) - ( ${parts[0]} )`
+                                const valueL = safeParse(termL).N()
+                                  .value as number
+
+                                const termR = `( ${refRight} ) - ( ${parts[1]} )`
+                                const valueR = safeParse(termR).N()
+                                  .value as number
+
+                                // console.log(termL, valueL, '\n', termR, valueR)
+
+                                if (Math.abs(valueL) > 0.00001) {
+                                  setInputState('left-mismatch')
+                                  return
+                                }
+                                if (Math.abs(valueR) > 0.00001) {
+                                  setInputState('right-mismatch')
+                                  return
                                 }
                                 //if (symbols.size == 0) break
                               }
@@ -672,9 +653,6 @@ export function EquationsApp() {
                       {inputState === 'var-mismatch' && (
                         <span>Variablen passen nicht</span>
                       )}
-                      {inputState === 'mismatch' && (
-                        <span>Vereinfachung nicht äquivalent</span>
-                      )}
                       {inputState === 'left-mismatch' && (
                         <span>
                           Term auf der linken Seite der Gleichung ist nicht

From 49e1df14f99b24a25571c49ac5270045165d1bfa Mon Sep 17 00:00:00 2001
From: Entkenntnis <Entkenntnis@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:30:29 +0100
Subject: [PATCH 3/4] fix bug with simplify

---
 src/components/equations-app/equations-app.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/equations-app/equations-app.tsx b/src/components/equations-app/equations-app.tsx
index 2edad62f73..2ff277a411 100644
--- a/src/components/equations-app/equations-app.tsx
+++ b/src/components/equations-app/equations-app.tsx
@@ -602,11 +602,17 @@ export function EquationsApp() {
 
                                 // console.log(termL, valueL, '\n', termR, valueR)
 
-                                if (Math.abs(valueL) > 0.00001) {
+                                if (
+                                  typeof valueL !== 'number' ||
+                                  Math.abs(valueL) > 0.00001
+                                ) {
                                   setInputState('left-mismatch')
                                   return
                                 }
-                                if (Math.abs(valueR) > 0.00001) {
+                                if (
+                                  typeof valueR !== 'number' ||
+                                  Math.abs(valueR) > 0.00001
+                                ) {
                                   setInputState('right-mismatch')
                                   return
                                 }

From 855707172106b89926c2ac94b01d7f74ff430494 Mon Sep 17 00:00:00 2001
From: Entkenntnis <Entkenntnis@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:30:53 +0100
Subject: [PATCH 4/4] disable warning

---
 src/components/equations-app/equations-app.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/equations-app/equations-app.tsx b/src/components/equations-app/equations-app.tsx
index 2ff277a411..b1889bd78c 100644
--- a/src/components/equations-app/equations-app.tsx
+++ b/src/components/equations-app/equations-app.tsx
@@ -103,6 +103,7 @@ export function EquationsApp() {
     return () => {
       window.removeEventListener('popstate', handlePopstate)
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   if (showOverview) {