From 00d72a156023ed96aa336b2345db3075839917d2 Mon Sep 17 00:00:00 2001
From: SinusFox <61253950+SinusFox@users.noreply.github.com>
Date: Mon, 7 Oct 2024 16:50:11 +0200
Subject: [PATCH] Adding RegEx input checks and updating text box explanations

---
 src/app/page.tsx   | 10 +++++-----
 src/app/scripts.ts | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9f1d499..41c7baa 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -19,19 +19,19 @@ export default function Home() {
       </header>
       <Box
         title={"Objective"}
-        placeholder={"Objective"}
+        placeholder={"Insert your objective here. One objective is allowed. Use one line for it (no \"enter\"!) Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx + y\n-786433 x1 + 655361 x2"}
         id="objective"/>
       <Box
         title={"Subject"}
-        placeholder={"Subject"}
+        placeholder={"Insert your subject here. One per line (divide by 'enter' button). Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\n+1 x + 2 y <= 15\n524321 x14 + 524305 x15 <= 4194303.5"}
         id="subject"/>
       <Box
         title={"Bounds"}
-        placeholder={"Bounds"}
+        placeholder={"Insert your bounds here. One per line (divide by 'enter' button). Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx >= 0\nx > 0\n0 <= x1 <= 1"}
         id="bounds"/>
       <Box
         title={"Variables"}
-        placeholder={"Your Variables here"}
+        placeholder={"List all your variables. One per line (divide by 'enter' button). Allowed symbols are a-z, A-Z.\nExample:\nx\ny"}
         id="vars" />
       <Button
         title={"Calculate"}
@@ -47,7 +47,7 @@ export default function Home() {
       <br></br>
       <Output
         id="out"
-        text={"Ergebnis"}/>
+        text={"Input a problem and an action button to display output..."}/>
       {/* <Popup_Button
         title="Popup"
         className="button"
diff --git a/src/app/scripts.ts b/src/app/scripts.ts
index f1da568..eb20879 100644
--- a/src/app/scripts.ts
+++ b/src/app/scripts.ts
@@ -46,6 +46,52 @@ function walltimeStart() {
   return Date.now();
 }
 
+function isInputValidRegex(obj: string | undefined, subj: string | undefined, bounds: string | undefined, vars: string | undefined): boolean {
+  customLog("Staring input checks...");
+  
+  // standard case: input is undefined - invalid
+  if (obj === undefined || obj === null || subj === undefined || subj === null || bounds === undefined || bounds === null || vars === undefined || vars === null) { 
+    customLog("Error: Function isInputValidRegex received undefined or null input.");
+    return false;
+  }
+
+  // RegEx check for objective
+  let regex = /^[ (\n)]*[\+-]? *((\d+(.\d+)? )?[a-zA-Z][a-zA-Z0-9]*)( *[\+-] *((\d+(.\d+)? )?[a-zA-Z][a-zA-Z0-9]*))*[ (\n)]*$/g;
+  let isValid = regex.test(obj);
+  if (!isValid) {
+    customLog("Error: Invalid or missing character in object box.");
+      return false;
+  }
+
+  // RegEx check for subject
+  regex = /^([ (\n)]*[\+-]* *(\d+(.\d+)? )?[a-zA-Z][a-zA-Z0-9]*( *[\+-] *(\d+(.\d+)? )?[a-zA-Z][a-zA-Z0-9]*)* *((<=?)|(>=?)|=) *[\+-]? *\d+(.\d+)?[ (\n)]*)+$/g;
+  isValid = regex.test(subj);
+  if (!isValid) {
+    customLog("Error: Invalid or missing character in subject box.");
+      return false;
+  }
+
+// RegEx check for subject
+regex = /[ (\n)]*(([a-zA-Z][a-zA-Z0-9]* *((<=?)|(>=?)|=) *\d(.\d+)?)|((\d(.\d+)?) *<=? *[a-zA-Z][a-zA-Z0-9]* *<= *(\d(.\d+)?)))[ (\n)]*/g;
+isValid = regex.test(bounds);
+if (!isValid) {
+  customLog("Error: Invalid or missing character in bounds box.");
+    return false;
+}
+
+  // RegEx check for variables
+  regex = /^ *([a-zA-Z][a-zA-Z0-9]*(\n)* *)+$/g;
+  isValid = regex.test(vars);
+  if (!isValid) {
+    customLog("Error: Invalid or missing  character in variables box.");
+    return false;
+  }
+
+  customLog("All input checks successful.");
+  customLog("");
+  return true;
+}
+
 function isInputFilled(obj: string | undefined, subj: string | undefined, bounds: string | undefined, vars: string | undefined) {
   if (obj == "" || obj == null || obj == undefined) {
     customLog("Error: Empty input field.");
@@ -148,6 +194,9 @@ export function calculate_click() {
   // catch error: empty input field(s)
   if (!isInputFilled(objective, subject, bounds, variables)) return;
 
+  // catch error: variables field has invalid characters
+  if (!isInputValidRegex(objective, subject, bounds, variables)) return;
+
   let wholeText: string = "Maximize\n obj: " + objective
                         + "\nSubject To \n" + subject 
                         + "\nBounds \n" + bounds