From e53a0e988cccd2b6eb21b5f07be5ffa31ad3378d Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Wed, 25 Oct 2023 19:43:52 +0200
Subject: [PATCH 01/24] Remove logical expression parsing

---
 .../dimacs/DimacsLogicalExpression.spec.ts    |   4 +-
 .../dimacs/LogicalExpressionParser.ts         | 202 +-----------------
 src/pages/solve/SAT.tsx                       |  11 +-
 3 files changed, 12 insertions(+), 205 deletions(-)

diff --git a/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts b/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
index d4d2506..71ecf8b 100644
--- a/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
+++ b/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
@@ -21,7 +21,7 @@ describe("Parsing", () => {
   let dimacsParser = new DimacsParser();
   let logicalExpressionParser = new LogicalExpressionParser();
 
-  each([
+  /*each([
     [
       "((1 or 2 or not 3) and (!4 and (not 5 and 6)) and 3 and (7 or 2))",
       "c First comment\nc Some Comment\nc 1 => 1\np sat 7\n*(+( 1  2  -3 )*( -4 *( -5  6 )) 3 +( 7  2 ))",
@@ -48,7 +48,7 @@ describe("Parsing", () => {
         logicalExpression
       );
     }
-  );
+  );*/
 
   each([
     [
diff --git a/src/converter/dimacs/LogicalExpressionParser.ts b/src/converter/dimacs/LogicalExpressionParser.ts
index e586eaf..7c990b8 100644
--- a/src/converter/dimacs/LogicalExpressionParser.ts
+++ b/src/converter/dimacs/LogicalExpressionParser.ts
@@ -21,17 +21,9 @@ const rules = [
   variableRule,
   blankRule,
 ];
-const rulesNegation = [negateRule, variableRule, blankRule];
-
-interface LeveledToken {
-  level: number;
-  token: Token;
-}
 
 export class LogicalExpressionParser {
   private lex: Lexer = new Lexer(rules);
-  private lexNegation: Lexer = new Lexer(rulesNegation);
-  private output: string = "";
 
   /**
    * Converts a logical expression to an expression in dimacs sat format
@@ -39,31 +31,12 @@ export class LogicalExpressionParser {
    * @param logicalExpression {string} logical expression
    * @returns {string} formula in dimacs sat format of the input
    */
-  public parseDimacs(logicalExpression: string): string {
-    this.output = "";
-
+  public validateLogicalExpression(logicalExpression: string): string[] {
     let tokens = this.lex.tokenize(logicalExpression);
-    if (tokens.length == 0) return this.output;
+    if (tokens.length == 0) return [];
 
     //Verify formula integrity
-    let errors = this.verifyTokens(tokens);
-    if (errors.length > 0) {
-      let errorStr = "";
-      for (let error of errors) errorStr += error + "\n";
-
-      throw new Error(errorStr);
-    }
-
-    //Handle variable comments and program start
-    let variables = this.convertVariables(tokens);
-    variables.forEach((num, str, _) => {
-      this.output += `c ${num} ${TokenName.variableAssignment} ${str}\n`;
-    });
-    this.output += `p sat ${variables.size}\n`;
-
-    this.parseFormula(tokens);
-
-    return this.output;
+    return this.verifyTokens(tokens);
   }
 
   private verifyTokens(tokens: Token[]): string[] {
@@ -121,173 +94,4 @@ export class LogicalExpressionParser {
 
     return errors;
   }
-  /**
-   * Converts any negative variable's negative prefix
-   * Converts all variables to numbers
-   * @param tokens {Token[]} array of tokens to search for variables
-   * @returns {Map<string, number>} variables mapped to their number representation
-   */
-  private convertVariables(tokens: Token[]): Map<string, number> {
-    let variables = new Map<string, number>();
-    const addToMap = (str: string): number => {
-      let number = variables.get(str);
-      if (number == undefined) {
-        number = variables.size + 1;
-        variables.set(str, number);
-      }
-
-      return number;
-    };
-
-    for (let i = 0; i < tokens.length; i++) {
-      switch (tokens[i].name) {
-        case TokenName.variable:
-          tokens[i].lexeme = addToMap(tokens[i].lexeme).toString();
-          break;
-        case TokenName.negatedVariable:
-          let negTokens = this.lexNegation.tokenize(tokens[i].lexeme);
-          if (negTokens.length != 2)
-            throw new Error(
-              "Can't parse negated variables that don't have two tokens"
-            );
-
-          let negToken = negTokens[1] as Token;
-          let varNumber = addToMap(negToken.lexeme);
-
-          //Replace negated variable with dimacs negative variable syntax
-          negToken.lexeme = `-${varNumber}`;
-          tokens[i] = negToken;
-          break;
-      }
-    }
-
-    return variables;
-  }
-
-  private getLeveledTokens(tokens: Token[]): LeveledToken[] {
-    let leveledTokens: LeveledToken[] = [];
-    let curLevel = 0;
-
-    for (let token of tokens) {
-      switch (token.name) {
-        case TokenName.open:
-          curLevel++;
-          break;
-        case TokenName.close:
-          curLevel--;
-          break;
-        default:
-          leveledTokens.push({ token: token, level: curLevel });
-          break;
-      }
-    }
-
-    return leveledTokens;
-  }
-
-  private parseFormula(tokens: Token[]) {
-    let leveledTokens = this.getLeveledTokens(tokens);
-
-    //Start recursive parsing of formula starting with or
-    this.processOR(leveledTokens);
-  }
-
-  private getOperatorPositions(
-    tokens: LeveledToken[],
-    operator: string,
-    level: number
-  ): number[] {
-    let positions: number[] = [];
-    for (let i = 0; i < tokens.length; i++) {
-      let token = tokens[i];
-      switch (token.token.name) {
-        case operator:
-          if (token.level == level) positions.push(i);
-          break;
-        default:
-          break;
-      }
-    }
-
-    //Always add token length
-    positions.push(tokens.length);
-
-    return positions;
-  }
-
-  private getMinLevel(tokens: LeveledToken[]): number {
-    let minLevel = undefined;
-
-    for (const token of tokens) {
-      if (minLevel == undefined || token.level < minLevel) {
-        minLevel = token.level;
-      }
-    }
-
-    return minLevel ?? -1;
-  }
-
-  private processAND(tokens: LeveledToken[]): LeveledToken[] {
-    if (tokens.length < 2) {
-      this.output += ` ${tokens[0].token.lexeme} `;
-      return tokens;
-    }
-
-    let level = this.getMinLevel(tokens);
-    let operatorPositions = this.getOperatorPositions(
-      tokens,
-      TokenName.and,
-      level
-    );
-    if (operatorPositions.length == 1) return this.processOR(tokens);
-
-    let returnTokens: LeveledToken[] = [];
-    let lastOr = -1;
-
-    this.output += `*(`;
-    for (let pos of operatorPositions) {
-      let before = tokens.slice(lastOr + 1, pos);
-      lastOr = pos;
-
-      let processedBefore = this.processOR(before);
-      returnTokens.push(...processedBefore);
-    }
-    this.output += `)`;
-
-    return returnTokens;
-  }
-
-  private processOR(tokens: LeveledToken[]): LeveledToken[] {
-    if (tokens.length < 2) {
-      this.output += ` ${tokens[0].token.lexeme} `;
-      return tokens;
-    }
-
-    let level = this.getMinLevel(tokens);
-    let operatorPositions = this.getOperatorPositions(
-      tokens,
-      TokenName.or,
-      level
-    );
-    if (operatorPositions.length == 1) return this.processAND(tokens);
-
-    let returnTokens: LeveledToken[] = [];
-    let lastOr = -1;
-
-    if (operatorPositions.length > 1) this.output += `+(`;
-    for (let pos of operatorPositions) {
-      let before = tokens.slice(lastOr + 1, pos);
-      lastOr = pos;
-
-      //Start processing nested expressions with OR
-      let processedBefore =
-        before[0].level != level
-          ? this.processOR(before)
-          : this.processAND(before);
-      returnTokens.push(...processedBefore);
-    }
-    if (operatorPositions.length > 1) this.output += `)`;
-
-    return returnTokens;
-  }
 }
diff --git a/src/pages/solve/SAT.tsx b/src/pages/solve/SAT.tsx
index 09d977a..d3db19b 100644
--- a/src/pages/solve/SAT.tsx
+++ b/src/pages/solve/SAT.tsx
@@ -47,11 +47,14 @@ const SAT: NextPage = () => {
         setProblemString={(value) => {
           setLogicalExpressionString(value);
 
-          try {
-            logicalExpressionParser.parseDimacs(value.toString());
+          let errors = logicalExpressionParser.validateLogicalExpression(
+            value.toString()
+          );
+
+          if (errors.length > 0) {
+            setErrorString(errors.toString());
+          } else {
             setErrorString("");
-          } catch (e: any) {
-            setErrorString(e.message);
           }
         }}
       />

From 9341dcd1f5e0c6d5207f3afef38ce7102ba67ca7 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Wed, 25 Oct 2023 19:45:28 +0200
Subject: [PATCH 02/24] Remove negated variable token and use separate tokens
 for negate and variable instead

---
 src/components/solvers/SAT/prism-SAT.ts        |  4 ++--
 .../dimacs/LogicalExpressionParser.ts          |  9 ++-------
 src/converter/dimacs/Syntax/CommonSyntax.ts    |  4 +---
 .../dimacs/Syntax/LogicalExpressionSyntax.ts   | 18 ++++--------------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/components/solvers/SAT/prism-SAT.ts b/src/components/solvers/SAT/prism-SAT.ts
index ba230f3..0cf8dc9 100644
--- a/src/components/solvers/SAT/prism-SAT.ts
+++ b/src/components/solvers/SAT/prism-SAT.ts
@@ -1,7 +1,7 @@
 import { regexVariable } from "../../../converter/dimacs/Syntax/CommonSyntax";
 import {
   regexAND,
-  regexNOTVariable,
+  regexNOT,
   regexOR,
 } from "../../../converter/dimacs/Syntax/LogicalExpressionSyntax";
 
@@ -16,7 +16,7 @@ export const SAT_language = {
   },
   "SAT-punctuation": /[()]/,
   negation: {
-    pattern: regexNOTVariable,
+    pattern: regexNOT,
     alias: "string",
   },
   "SAT-variable": {
diff --git a/src/converter/dimacs/LogicalExpressionParser.ts b/src/converter/dimacs/LogicalExpressionParser.ts
index 7c990b8..37ecdd9 100644
--- a/src/converter/dimacs/LogicalExpressionParser.ts
+++ b/src/converter/dimacs/LogicalExpressionParser.ts
@@ -5,19 +5,14 @@ import {
   variableRule,
   blankRule,
 } from "./Syntax/CommonSyntax";
-import {
-  andRule,
-  negatedVariableRule,
-  negateRule,
-  orRule,
-} from "./Syntax/LogicalExpressionSyntax";
+import { andRule, negateRule, orRule } from "./Syntax/LogicalExpressionSyntax";
 
 // the order is important - tokens are applied from first to last
 const rules = [
   ...parenthesesRule,
   orRule,
   andRule,
-  negatedVariableRule,
+  negateRule,
   variableRule,
   blankRule,
 ];
diff --git a/src/converter/dimacs/Syntax/CommonSyntax.ts b/src/converter/dimacs/Syntax/CommonSyntax.ts
index 50cd601..83f872d 100644
--- a/src/converter/dimacs/Syntax/CommonSyntax.ts
+++ b/src/converter/dimacs/Syntax/CommonSyntax.ts
@@ -7,12 +7,10 @@ export enum TokenName {
   open = "open",
   close = "close",
   variable = "variable",
-  negatedVariable = "negatedVariable",
   variableAssignment = "=>",
 }
 
-export const variableRegexPart = "(?:[A-z]|\\d)+";
-export const regexVariable = new RegExp(variableRegexPart);
+export const regexVariable = /(?:[A-z]|\d)+/;
 export const regexBlank = /\s+/g;
 
 export const variableRule = new Rule({
diff --git a/src/converter/dimacs/Syntax/LogicalExpressionSyntax.ts b/src/converter/dimacs/Syntax/LogicalExpressionSyntax.ts
index e600194..ead78af 100644
--- a/src/converter/dimacs/Syntax/LogicalExpressionSyntax.ts
+++ b/src/converter/dimacs/Syntax/LogicalExpressionSyntax.ts
@@ -1,25 +1,15 @@
 import { Rule } from "@jlguenego/lexer";
-import { TokenName, variableRegexPart } from "./CommonSyntax";
+import { TokenName } from "./CommonSyntax";
 
-export const negateRegexPart = "(?:(?:not|NOT)\\s+|(?:!\\s*))";
-
-export const regexAND = /(?:&|and|AND) /;
-export const regexOR = /(?:\||or|OR) /;
-export const regexNOT = new RegExp(negateRegexPart, "g");
-export const regexNOTVariable = new RegExp(
-  `${negateRegexPart}\\s*${variableRegexPart}`
-);
+export const regexAND = /(?:&|and|AND)\b/;
+export const regexOR = /(?:\||or|OR)\b/;
+export const regexNOT = /not|NOT|!/g;
 
 export const negateRule = new Rule({
   name: TokenName.negate,
   pattern: regexNOT,
 });
 
-export const negatedVariableRule = new Rule({
-  name: TokenName.negatedVariable,
-  pattern: regexNOTVariable,
-});
-
 export const andRule = new Rule({
   name: TokenName.and,
   pattern: regexAND,

From 60085dccf6a4af249c8c6cb7b7e5896ef862e2bf Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Wed, 25 Oct 2023 19:45:44 +0200
Subject: [PATCH 03/24] Add more logical expression validations

---
 .../dimacs/LogicalExpressionParser.ts         | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/converter/dimacs/LogicalExpressionParser.ts b/src/converter/dimacs/LogicalExpressionParser.ts
index 37ecdd9..fd36e7f 100644
--- a/src/converter/dimacs/LogicalExpressionParser.ts
+++ b/src/converter/dimacs/LogicalExpressionParser.ts
@@ -39,6 +39,8 @@ export class LogicalExpressionParser {
     let wasOperator = false;
     let wasVariable = false;
     let wasClose = false;
+    let wasOpen = false;
+    let wasNegate = false;
 
     if (tokens.length > 0) {
       switch (tokens[0].name) {
@@ -62,8 +64,19 @@ export class LogicalExpressionParser {
         case TokenName.and:
           if (wasOperator)
             errors.push("Two operators (AND/OR) can't be next to each other");
+          if (wasOpen)
+            errors.push(
+              `Operator '${token.lexeme}' can't be after an opening parenthesis`
+            );
+          break;
+        case TokenName.negate:
+          if (wasClose)
+            errors.push(
+              `Negation '${token.lexeme}' is after a closing parenthesis`
+            );
+          if (wasVariable)
+            errors.push(`Negation '${token.lexeme}' is after a variable`);
           break;
-        case TokenName.negatedVariable:
         case TokenName.variable:
           if (wasVariable)
             errors.push(
@@ -78,13 +91,21 @@ export class LogicalExpressionParser {
           if (wasVariable)
             errors.push("Parenthesis can't be opened after a variable");
           break;
+        case TokenName.close:
+          if (wasOperator)
+            errors.push(
+              "Parenthesis can't be closed after an operator (AND/OR)"
+            );
+          if (wasNegate)
+            errors.push("Parenthesis can't be closed after a negation");
+          break;
       }
 
       wasOperator = token.name == TokenName.and || token.name == TokenName.or;
-      wasVariable =
-        token.name == TokenName.variable ||
-        token.name == TokenName.negatedVariable;
+      wasVariable = token.name == TokenName.variable;
+      wasOpen = token.name == TokenName.open;
       wasClose = token.name == TokenName.close;
+      wasNegate = token.name == TokenName.negate;
     }
 
     return errors;

From 5d550c875dfa47623d46a69a3bc7eded36706fd6 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 2 Nov 2023 19:14:44 +0100
Subject: [PATCH 04/24] Refactor text synchronization

---
 src/components/solvers/SAT/TextArea.tsx  |  2 +-
 src/components/solvers/TextInputMask.tsx | 11 +++++------
 src/pages/solve/FeatureModelAnomaly.tsx  |  5 ++---
 src/pages/solve/MaxCut.tsx               |  3 ++-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/solvers/SAT/TextArea.tsx b/src/components/solvers/SAT/TextArea.tsx
index b18ca71..57ebe48 100644
--- a/src/components/solvers/SAT/TextArea.tsx
+++ b/src/components/solvers/SAT/TextArea.tsx
@@ -7,7 +7,7 @@ import { SAT_language } from "./prism-SAT";
 
 interface TextAreaProps {
   problemString: string;
-  setProblemString: React.Dispatch<React.SetStateAction<string>>;
+  setProblemString: (problemString: string) => void;
 }
 
 export const TextArea = (props: TextAreaProps) => {
diff --git a/src/components/solvers/TextInputMask.tsx b/src/components/solvers/TextInputMask.tsx
index ec44db7..a4b3329 100644
--- a/src/components/solvers/TextInputMask.tsx
+++ b/src/components/solvers/TextInputMask.tsx
@@ -8,18 +8,17 @@ import { EditorControls } from "./EditorControls";
 
 export interface TextInputMaskProperties {
   textPlaceholder: string;
-  onTextChanged: (text: string) => void;
+  text: string;
+  setText: (value: string) => void;
   body?: ReactElement;
 }
 
 export const TextInputMask = (props: TextInputMaskProperties) => {
-  const [text, setText] = useState<string>("");
   const [errorString, setErrorString] = useState("");
 
   function onTextChanged(text: string): void {
     try {
-      setText(text);
-      props.onTextChanged(text);
+      props.setText(text);
 
       setErrorString("");
     } catch (e: any) {
@@ -40,11 +39,11 @@ export const TextInputMask = (props: TextInputMaskProperties) => {
         errorText={errorString}
         idleText={props.textPlaceholder + " 👇"}
         onUpload={onTextChanged}
-        editorContent={text}
+        editorContent={props.text}
       />
       <Textarea
         placeholder={props.textPlaceholder}
-        value={text}
+        value={props.text}
         minHeight="10rem"
         isInvalid={errorString != ""}
         onChange={(x) => onTextChanged(x.target.value)}
diff --git a/src/pages/solve/FeatureModelAnomaly.tsx b/src/pages/solve/FeatureModelAnomaly.tsx
index a803d78..39a4c75 100644
--- a/src/pages/solve/FeatureModelAnomaly.tsx
+++ b/src/pages/solve/FeatureModelAnomaly.tsx
@@ -2,9 +2,7 @@ import {
   Box,
   Divider,
   Heading,
-  List,
   ListItem,
-  Spacer,
   Text,
   UnorderedList,
   VStack,
@@ -53,8 +51,9 @@ const FeatureModelAnomaly: NextPage = () => {
       </UnorderedList>
 
       <TextInputMask
+        text={uvl}
+        setText={setUvl}
         textPlaceholder="Enter your feature model in UVL format"
-        onTextChanged={setUvl}
         body={
           <VStack>
             <Box width="300px">
diff --git a/src/pages/solve/MaxCut.tsx b/src/pages/solve/MaxCut.tsx
index 28c3be5..75ecf7b 100644
--- a/src/pages/solve/MaxCut.tsx
+++ b/src/pages/solve/MaxCut.tsx
@@ -47,7 +47,8 @@ const MaxCut: NextPage = () => {
 
       <TextInputMask
         textPlaceholder="Enter your graph in GML format"
-        onTextChanged={change}
+        text={graphData}
+        setText={change}
         body={
           <Container>
             <Center>

From 820b1f5f59f7b596b4b01fe1b51141d28db44ac6 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 2 Nov 2023 19:16:03 +0100
Subject: [PATCH 05/24] Add fetchSolution API call

---
 src/api/ToolboxAPI.ts | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/api/ToolboxAPI.ts b/src/api/ToolboxAPI.ts
index d0703f0..4b86d3c 100644
--- a/src/api/ToolboxAPI.ts
+++ b/src/api/ToolboxAPI.ts
@@ -10,6 +10,19 @@ import { SolveRequest } from "./data-model/SolveRequest";
  */
 export const baseUrl = () => process.env.NEXT_PUBLIC_API_BASE_URL;
 
+function invalidSolution(reason: string): Solution {
+  return {
+    id: -1,
+    status: SolutionStatus.INVALID,
+    solverName: "",
+    executionMilliseconds: 0,
+    solutionData: "",
+    debugData: "",
+    metaData: "",
+    error: `${reason}`,
+  };
+}
+
 export async function postProblem<T>(
   problemType: string,
   solveRequest: SolveRequest<T>
@@ -23,18 +36,19 @@ export async function postProblem<T>(
   })
     .then((response) => response.json())
     .then((json) => json as Solution)
-    .catch((reason) => {
-      return {
-        id: -1,
-        status: SolutionStatus.INVALID,
-        solverName: "",
-        executionMilliseconds: 0,
-        solutionData: "",
-        debugData: "",
-        metaData: "",
-        error: `${reason}`,
-      };
-    });
+    .catch(invalidSolution);
+}
+
+export async function fetchSolution(problemType: string, solutionId: number) {
+  return fetch(`${baseUrl()}/solution/${problemType}?id=${solutionId}`, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+    },
+  })
+    .then((response) => response.json())
+    .then((json) => json as Solution)
+    .catch(invalidSolution);
 }
 
 export async function fetchSolvers(

From 6b52dd6914b52187146a15162783dbf98a4cc053 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 2 Nov 2023 19:16:14 +0100
Subject: [PATCH 06/24] Add history

---
 src/components/solvers/History.tsx         | 48 +++++++++++++++
 src/components/solvers/ProgressHandler.tsx | 71 ++++++++++++++++++++--
 src/pages/solve/FeatureModelAnomaly.tsx    |  1 +
 src/pages/solve/MaxCut.tsx                 |  1 +
 src/pages/solve/SAT.tsx                    | 30 ++++-----
 5 files changed, 132 insertions(+), 19 deletions(-)
 create mode 100644 src/components/solvers/History.tsx

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
new file mode 100644
index 0000000..49a81ee
--- /dev/null
+++ b/src/components/solvers/History.tsx
@@ -0,0 +1,48 @@
+import {
+  Button,
+  Divider,
+  Heading,
+  List,
+  ListItem,
+  Stack,
+} from "@chakra-ui/react";
+import { ProblemState, ProblemTypeSolutionId } from "./ProgressHandler";
+
+interface HistoryProps<T> {
+  problemStates: ProblemState<T>[];
+
+  setContent: (t: T) => void;
+  loadSolution: (id: ProblemTypeSolutionId) => void;
+}
+
+export const History = <T extends {}>(props: HistoryProps<T>) => {
+  if (props.problemStates.length == 0) return null;
+
+  function reloadState(state: ProblemState<T>) {
+    props.setContent(state.content);
+    props.loadSolution(state.solutionIds);
+  }
+
+  return (
+    <Stack>
+      <Heading as="h3" size="md" textAlign="center">
+        History
+      </Heading>
+      <List>
+        {props.problemStates.map((x) => (
+          <ListItem key={x.content}>
+            <Button
+              width="200px"
+              overflow="hidden"
+              variant="link"
+              onClick={(_) => reloadState(x)}
+            >
+              {x.content.toString()}
+            </Button>
+            <Divider />
+          </ListItem>
+        ))}
+      </List>
+    </Stack>
+  );
+};
diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index de12e0b..9b98434 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -1,19 +1,36 @@
-import { Box, Center, HStack, VStack } from "@chakra-ui/react";
+import { Box, Center, HStack } from "@chakra-ui/react";
 import React, { useState } from "react";
+import { History } from "./History";
 import { GoButton } from "./buttons/GoButton";
-import { postProblem } from "../../api/ToolboxAPI";
+import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
 import { SolutionView } from "./SolutionView";
 import { Container } from "../Container";
 import { Solution } from "../../api/data-model/Solution";
 import { SolveRequest } from "../../api/data-model/SolveRequest";
 import { SolverPicker } from "./SolverPicker";
 
+export interface ProblemState<T> {
+  /**
+   * Problem input
+   */
+  content: T;
+  /**
+   * Ids of the solutions of the problem input per problem type
+   */
+  solutionIds: ProblemTypeSolutionId;
+}
+
+export type ProblemTypeSolutionId = {
+  [problemTypeId: string]: number;
+};
+
 export interface ProgressHandlerProps<T> {
   /**
    * List of problem types that should be solved with the given input.
    */
   problemTypes: string[];
   problemInput: T;
+  setProblemInput: (t: T) => void;
 }
 
 export const ProgressHandler = <T extends {}>(
@@ -22,15 +39,28 @@ export const ProgressHandler = <T extends {}>(
   const [wasClicked, setClicked] = useState<boolean>(false);
   const [finished, setFinished] = useState<boolean>(false);
   const [solutions, setSolutions] = useState<Solution[]>();
+  const [problemStates, setProblemStates] = useState<ProblemState<T>[]>([]);
   const [solveRequest, setSolveRequest] = useState<SolveRequest<T>>({
     requestContent: props.problemInput,
     requestedSubSolveRequests: {},
   });
 
-  async function startSolving() {
+  async function getSolution() {
     setClicked(true);
     setFinished(false);
 
+    // Check if the problem was previously solved
+    let existingProblem = problemStates.find(
+      (state) => state.content == props.problemInput
+    );
+    if (existingProblem !== undefined) {
+      await loadSolution(existingProblem.solutionIds);
+    } else {
+      await startSolving();
+    }
+  }
+
+  async function startSolving() {
     let newSolveRequest: SolveRequest<T> = {
       ...solveRequest,
       requestContent: props.problemInput,
@@ -39,7 +69,32 @@ export const ProgressHandler = <T extends {}>(
     setSolveRequest(newSolveRequest);
     Promise.all(
       props.problemTypes.map((problemType) =>
-        postProblem(problemType, newSolveRequest)
+        postProblem(problemType, newSolveRequest).then((s) => ({
+          problemType: problemType,
+          solution: s,
+        }))
+      )
+    ).then((result) => {
+      let solutionIdMap = result.reduce((acc, item) => {
+        acc[item.problemType] = item.solution.id;
+        return acc;
+      }, {} as ProblemTypeSolutionId);
+
+      let newProblemState: ProblemState<T> = {
+        content: props.problemInput,
+        solutionIds: solutionIdMap,
+      };
+
+      setSolutions(result.map((x) => x.solution));
+      setProblemStates([...problemStates, newProblemState]);
+      setFinished(true);
+    });
+  }
+
+  async function loadSolution(ids: ProblemTypeSolutionId) {
+    Promise.all(
+      props.problemTypes.map((problemType) =>
+        fetchSolution(problemType, ids[problemType])
       )
     ).then((solutions) => {
       setSolutions(solutions);
@@ -66,7 +121,7 @@ export const ProgressHandler = <T extends {}>(
             />
           ))}
           <Center>
-            <GoButton clicked={startSolving} />
+            <GoButton clicked={getSolution} />
           </Center>
         </HStack>
       ) : null}
@@ -86,6 +141,12 @@ export const ProgressHandler = <T extends {}>(
             </Box>
           ))
         : null}
+
+      <History
+        problemStates={problemStates}
+        loadSolution={loadSolution}
+        setContent={props.setProblemInput}
+      />
     </Container>
   );
 };
diff --git a/src/pages/solve/FeatureModelAnomaly.tsx b/src/pages/solve/FeatureModelAnomaly.tsx
index 39a4c75..c63fadc 100644
--- a/src/pages/solve/FeatureModelAnomaly.tsx
+++ b/src/pages/solve/FeatureModelAnomaly.tsx
@@ -70,6 +70,7 @@ const FeatureModelAnomaly: NextPage = () => {
             <ProgressHandler
               problemTypes={selectedAnomalies.map((option) => option.value)}
               problemInput={uvl}
+              setProblemInput={setUvl}
             />
           </VStack>
         }
diff --git a/src/pages/solve/MaxCut.tsx b/src/pages/solve/MaxCut.tsx
index 75ecf7b..4b57ead 100644
--- a/src/pages/solve/MaxCut.tsx
+++ b/src/pages/solve/MaxCut.tsx
@@ -63,6 +63,7 @@ const MaxCut: NextPage = () => {
             <ProgressHandler
               problemTypes={["max-cut"]}
               problemInput={graphString}
+              setProblemInput={change}
             />
           </Container>
         }
diff --git a/src/pages/solve/SAT.tsx b/src/pages/solve/SAT.tsx
index d3db19b..230a21e 100644
--- a/src/pages/solve/SAT.tsx
+++ b/src/pages/solve/SAT.tsx
@@ -4,7 +4,6 @@ import type { NextPage } from "next";
 import { TextArea } from "../../components/solvers/SAT/TextArea";
 import { ProgressHandler } from "../../components/solvers/ProgressHandler";
 import { Text, Divider, Heading, Spacer } from "@chakra-ui/react";
-import { DimacsParser } from "../../converter/dimacs/DimacsParser";
 import { LogicalExpressionParser } from "../../converter/dimacs/LogicalExpressionParser";
 import { Layout } from "../../components/layout/Layout";
 import { EditorControls } from "../../components/solvers/EditorControls";
@@ -16,6 +15,20 @@ const SAT: NextPage = () => {
   const [logicalExpressionString, setLogicalExpressionString] = useState("");
   const [errorString, setErrorString] = useState("");
 
+  function updateProblemString(newValue: string) {
+    setLogicalExpressionString(newValue);
+
+    let errors = logicalExpressionParser.validateLogicalExpression(
+      newValue.toString()
+    );
+
+    if (errors.length > 0) {
+      setErrorString(errors.toString());
+    } else {
+      setErrorString("");
+    }
+  }
+
   return (
     <Layout>
       <Head>
@@ -44,24 +57,13 @@ const SAT: NextPage = () => {
       />
       <TextArea
         problemString={logicalExpressionString}
-        setProblemString={(value) => {
-          setLogicalExpressionString(value);
-
-          let errors = logicalExpressionParser.validateLogicalExpression(
-            value.toString()
-          );
-
-          if (errors.length > 0) {
-            setErrorString(errors.toString());
-          } else {
-            setErrorString("");
-          }
-        }}
+        setProblemString={updateProblemString}
       />
       <Divider />
       <ProgressHandler
         problemTypes={["sat"]}
         problemInput={logicalExpressionString}
+        setProblemInput={updateProblemString}
       />
     </Layout>
   );

From a220fbc5f5c9dfa814ab518c45a7e140246c5fe4 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 2 Nov 2023 19:37:27 +0100
Subject: [PATCH 07/24] Give the ListItem key a proper value

---
 src/components/solvers/History.tsx | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
index 49a81ee..a20fa0f 100644
--- a/src/components/solvers/History.tsx
+++ b/src/components/solvers/History.tsx
@@ -29,19 +29,22 @@ export const History = <T extends {}>(props: HistoryProps<T>) => {
         History
       </Heading>
       <List>
-        {props.problemStates.map((x) => (
-          <ListItem key={x.content}>
-            <Button
-              width="200px"
-              overflow="hidden"
-              variant="link"
-              onClick={(_) => reloadState(x)}
-            >
-              {x.content.toString()}
-            </Button>
-            <Divider />
-          </ListItem>
-        ))}
+        {props.problemStates.map((x) => {
+          let contentString = x.content.toString();
+          return (
+            <ListItem key={contentString}>
+              <Button
+                width="200px"
+                overflow="hidden"
+                variant="link"
+                onClick={(_) => reloadState(x)}
+              >
+                {contentString}
+              </Button>
+              <Divider />
+            </ListItem>
+          );
+        })}
       </List>
     </Stack>
   );

From 23b0da787eca05371cc8e63a6d17fd7e4b26d19f Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 12:44:04 +0100
Subject: [PATCH 08/24] Add tooltip to be able to see the full text for long
 problems

---
 src/components/solvers/History.tsx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
index a20fa0f..46a7b44 100644
--- a/src/components/solvers/History.tsx
+++ b/src/components/solvers/History.tsx
@@ -5,6 +5,7 @@ import {
   List,
   ListItem,
   Stack,
+  Tooltip,
 } from "@chakra-ui/react";
 import { ProblemState, ProblemTypeSolutionId } from "./ProgressHandler";
 
@@ -33,14 +34,16 @@ export const History = <T extends {}>(props: HistoryProps<T>) => {
           let contentString = x.content.toString();
           return (
             <ListItem key={contentString}>
-              <Button
-                width="200px"
-                overflow="hidden"
-                variant="link"
-                onClick={(_) => reloadState(x)}
-              >
-                {contentString}
-              </Button>
+              <Tooltip label={contentString}>
+                <Button
+                  width="200px"
+                  overflow="hidden"
+                  variant="link"
+                  onClick={(_) => reloadState(x)}
+                >
+                  {contentString}
+                </Button>
+              </Tooltip>
               <Divider />
             </ListItem>
           );

From 4d6fbe02a550e2badc284baff2696c84f1f6edad Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 12:44:37 +0100
Subject: [PATCH 09/24] Add load spinner for loading solutions too

---
 src/components/solvers/ProgressHandler.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index 9b98434..c5480d0 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -92,6 +92,9 @@ export const ProgressHandler = <T extends {}>(
   }
 
   async function loadSolution(ids: ProblemTypeSolutionId) {
+    setClicked(true);
+    setFinished(false);
+
     Promise.all(
       props.problemTypes.map((problemType) =>
         fetchSolution(problemType, ids[problemType])

From 59786da067889e1d41e9430f2d621fd78ef84c8d Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 12:45:22 +0100
Subject: [PATCH 10/24] Add cookie library

---
 package.json |  1 +
 yarn.lock    | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ee530d9..cdf1d8d 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "next": "12.2.5",
     "prismjs": "^1.29.0",
     "react": "18.2.0",
+    "react-cookie": "^6.1.1",
     "react-dom": "18.2.0",
     "react-icons": "^4.4.0",
     "react-multi-select-component": "^4.3.4",
diff --git a/yarn.lock b/yarn.lock
index 6920315..30f8df7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2086,6 +2086,11 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@types/cookie@^0.5.1":
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.5.4.tgz#7e70a20cd695bc48d46b08c2505874cd68b760e0"
+  integrity sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==
+
 "@types/d3-timer@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-2.0.1.tgz#ffb6620d290624f3726aa362c0c8a4b44c8d7200"
@@ -2098,6 +2103,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/hoist-non-react-statics@^3.3.1":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
+  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
+  dependencies:
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
@@ -2770,6 +2783,11 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
+cookie@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
 copy-to-clipboard@3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
@@ -3808,7 +3826,7 @@ hey-listen@^1.0.8:
   resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
   integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
 
-hoist-non-react-statics@^3.3.1:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -5194,6 +5212,15 @@ react-clientside-effect@^1.2.6:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
+react-cookie@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-6.1.1.tgz#af61c82ea7f41119d3cf8fd3534f8b6c0408f350"
+  integrity sha512-fuFRpf8LH6SfmVMowDUIRywJF5jAUDUWrm0EI5VdXfTl5bPcJ7B0zWbuYpT0Tvikx7Gs18MlvAT+P+744dUz2g==
+  dependencies:
+    "@types/hoist-non-react-statics" "^3.3.1"
+    hoist-non-react-statics "^3.3.2"
+    universal-cookie "^6.0.0"
+
 react-dom@18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
@@ -5792,6 +5819,14 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+universal-cookie@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-6.1.1.tgz#2d619e21804c93b39ff0c77fe47dafd7a492346d"
+  integrity sha512-33S9x3CpdUnnjwTNs2Fgc41WGve2tdLtvaK2kPSbZRc5pGpz2vQFbRWMxlATsxNNe/Cy8SzmnmbuBM85jpZPtA==
+  dependencies:
+    "@types/cookie" "^0.5.1"
+    cookie "^0.5.0"
+
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"

From dcc77253203940563e2194223dfc13e3100a642e Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 12:45:26 +0100
Subject: [PATCH 11/24] Add cookie to store history

---
 src/components/solvers/ProgressHandler.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index c5480d0..2dcd62c 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -1,5 +1,6 @@
 import { Box, Center, HStack } from "@chakra-ui/react";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
+import { useCookies } from "react-cookie";
 import { History } from "./History";
 import { GoButton } from "./buttons/GoButton";
 import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
@@ -44,6 +45,15 @@ export const ProgressHandler = <T extends {}>(
     requestContent: props.problemInput,
     requestedSubSolveRequests: {},
   });
+  const [cookies, setCookie, removeCookie] = useCookies(["problemStates"]);
+
+  useEffect(() => {
+    // Handle problem states cookies
+    if (problemStates.length == 0 && cookies.problemStates?.length > 0) {
+      setProblemStates(cookies.problemStates);
+    }
+    setCookie("problemStates", problemStates);
+  }, [problemStates, cookies, setCookie]);
 
   async function getSolution() {
     setClicked(true);

From 98bc3c250e5f4f4aadcf31133025f36a9759bddc Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 12:59:58 +0100
Subject: [PATCH 12/24] Fix using wrong variable for MaxCut text

---
 src/pages/solve/MaxCut.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/solve/MaxCut.tsx b/src/pages/solve/MaxCut.tsx
index 4b57ead..1790e6c 100644
--- a/src/pages/solve/MaxCut.tsx
+++ b/src/pages/solve/MaxCut.tsx
@@ -47,7 +47,7 @@ const MaxCut: NextPage = () => {
 
       <TextInputMask
         textPlaceholder="Enter your graph in GML format"
-        text={graphData}
+        text={graphString}
         setText={change}
         body={
           <Container>

From 297877a7d34983e5e219f622a88f368fbb0f7cec Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 13:17:40 +0100
Subject: [PATCH 13/24] Use different cookies for different problem types and
 useEffect loop

---
 src/components/solvers/ProgressHandler.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index 2dcd62c..f2428b8 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -37,6 +37,8 @@ export interface ProgressHandlerProps<T> {
 export const ProgressHandler = <T extends {}>(
   props: ProgressHandlerProps<T>
 ) => {
+  const historyCookieName: string = `problemStates-${props.problemTypes}`;
+
   const [wasClicked, setClicked] = useState<boolean>(false);
   const [finished, setFinished] = useState<boolean>(false);
   const [solutions, setSolutions] = useState<Solution[]>();
@@ -45,15 +47,18 @@ export const ProgressHandler = <T extends {}>(
     requestContent: props.problemInput,
     requestedSubSolveRequests: {},
   });
-  const [cookies, setCookie, removeCookie] = useCookies(["problemStates"]);
+  const [cookies, setCookies] = useCookies([historyCookieName]);
 
   useEffect(() => {
     // Handle problem states cookies
-    if (problemStates.length == 0 && cookies.problemStates?.length > 0) {
-      setProblemStates(cookies.problemStates);
+    if (problemStates.length == 0 && cookies[historyCookieName]?.length > 0) {
+      setProblemStates(cookies[historyCookieName]);
     }
-    setCookie("problemStates", problemStates);
-  }, [problemStates, cookies, setCookie]);
+  }, [problemStates, cookies, historyCookieName]);
+
+  useEffect(() => {
+    setCookies(historyCookieName, problemStates);
+  }, [historyCookieName, problemStates, setCookies]);
 
   async function getSolution() {
     setClicked(true);

From ce58623b9525b0aef39c744f174874da574880c1 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Thu, 9 Nov 2023 15:17:09 +0100
Subject: [PATCH 14/24] Don't try to load an existing solution when clicking
 then Go button

---
 src/components/solvers/ProgressHandler.tsx | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index f2428b8..9696b72 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -64,18 +64,6 @@ export const ProgressHandler = <T extends {}>(
     setClicked(true);
     setFinished(false);
 
-    // Check if the problem was previously solved
-    let existingProblem = problemStates.find(
-      (state) => state.content == props.problemInput
-    );
-    if (existingProblem !== undefined) {
-      await loadSolution(existingProblem.solutionIds);
-    } else {
-      await startSolving();
-    }
-  }
-
-  async function startSolving() {
     let newSolveRequest: SolveRequest<T> = {
       ...solveRequest,
       requestContent: props.problemInput,

From 7b723a0a503528be69f59dbeae44375b6477e0a1 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 14 Nov 2023 19:02:08 +0100
Subject: [PATCH 15/24] Revert "Add cookie library"

This reverts commit 59786da067889e1d41e9430f2d621fd78ef84c8d.
---
 package.json |  1 -
 yarn.lock    | 37 +------------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/package.json b/package.json
index cdf1d8d..ee530d9 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "next": "12.2.5",
     "prismjs": "^1.29.0",
     "react": "18.2.0",
-    "react-cookie": "^6.1.1",
     "react-dom": "18.2.0",
     "react-icons": "^4.4.0",
     "react-multi-select-component": "^4.3.4",
diff --git a/yarn.lock b/yarn.lock
index 30f8df7..6920315 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2086,11 +2086,6 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/cookie@^0.5.1":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.5.4.tgz#7e70a20cd695bc48d46b08c2505874cd68b760e0"
-  integrity sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==
-
 "@types/d3-timer@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-2.0.1.tgz#ffb6620d290624f3726aa362c0c8a4b44c8d7200"
@@ -2103,14 +2098,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
-  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
@@ -2783,11 +2770,6 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
 copy-to-clipboard@3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
@@ -3826,7 +3808,7 @@ hey-listen@^1.0.8:
   resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
   integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -5212,15 +5194,6 @@ react-clientside-effect@^1.2.6:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-cookie@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-6.1.1.tgz#af61c82ea7f41119d3cf8fd3534f8b6c0408f350"
-  integrity sha512-fuFRpf8LH6SfmVMowDUIRywJF5jAUDUWrm0EI5VdXfTl5bPcJ7B0zWbuYpT0Tvikx7Gs18MlvAT+P+744dUz2g==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.1"
-    hoist-non-react-statics "^3.3.2"
-    universal-cookie "^6.0.0"
-
 react-dom@18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
@@ -5819,14 +5792,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-universal-cookie@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-6.1.1.tgz#2d619e21804c93b39ff0c77fe47dafd7a492346d"
-  integrity sha512-33S9x3CpdUnnjwTNs2Fgc41WGve2tdLtvaK2kPSbZRc5pGpz2vQFbRWMxlATsxNNe/Cy8SzmnmbuBM85jpZPtA==
-  dependencies:
-    "@types/cookie" "^0.5.1"
-    cookie "^0.5.0"
-
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"

From 4e254b817184a87b152cb4c1892ee4d38a26d3af Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 14 Nov 2023 19:02:32 +0100
Subject: [PATCH 16/24] Replace cookie approach with local storage

---
 src/components/solvers/ProgressHandler.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index 9696b72..b989b26 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -1,6 +1,5 @@
 import { Box, Center, HStack } from "@chakra-ui/react";
 import React, { useEffect, useState } from "react";
-import { useCookies } from "react-cookie";
 import { History } from "./History";
 import { GoButton } from "./buttons/GoButton";
 import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
@@ -37,7 +36,7 @@ export interface ProgressHandlerProps<T> {
 export const ProgressHandler = <T extends {}>(
   props: ProgressHandlerProps<T>
 ) => {
-  const historyCookieName: string = `problemStates-${props.problemTypes}`;
+  const historyItemName: string = `problemStates-${props.problemTypes}`;
 
   const [wasClicked, setClicked] = useState<boolean>(false);
   const [finished, setFinished] = useState<boolean>(false);
@@ -47,18 +46,23 @@ export const ProgressHandler = <T extends {}>(
     requestContent: props.problemInput,
     requestedSubSolveRequests: {},
   });
-  const [cookies, setCookies] = useCookies([historyCookieName]);
 
   useEffect(() => {
-    // Handle problem states cookies
-    if (problemStates.length == 0 && cookies[historyCookieName]?.length > 0) {
-      setProblemStates(cookies[historyCookieName]);
+    // Handle problem states from local storage
+    if (problemStates.length == 0) {
+      let historyItem = localStorage.getItem(historyItemName);
+      if (historyItem == null) return;
+
+      let storageStates = JSON.parse(historyItem);
+      if (storageStates.length > 0) {
+        setProblemStates(storageStates);
+      }
     }
-  }, [problemStates, cookies, historyCookieName]);
+  }, [problemStates, historyItemName]);
 
   useEffect(() => {
-    setCookies(historyCookieName, problemStates);
-  }, [historyCookieName, problemStates, setCookies]);
+    localStorage.setItem(historyItemName, JSON.stringify(problemStates));
+  }, [historyItemName, problemStates]);
 
   async function getSolution() {
     setClicked(true);

From 1af6a83d81dc59b56be36bcc38084e168cd154c8 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 13:47:14 +0100
Subject: [PATCH 17/24] Reduce History api to one function onRequestRollback

---
 src/components/solvers/History.tsx         |  8 +++-----
 src/components/solvers/ProgressHandler.tsx | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
index 46a7b44..6273e24 100644
--- a/src/components/solvers/History.tsx
+++ b/src/components/solvers/History.tsx
@@ -7,21 +7,19 @@ import {
   Stack,
   Tooltip,
 } from "@chakra-ui/react";
-import { ProblemState, ProblemTypeSolutionId } from "./ProgressHandler";
+import { ProblemState } from "./ProgressHandler";
 
 interface HistoryProps<T> {
   problemStates: ProblemState<T>[];
 
-  setContent: (t: T) => void;
-  loadSolution: (id: ProblemTypeSolutionId) => void;
+  onRequestRollback: (problemState: ProblemState<T>) => void;
 }
 
 export const History = <T extends {}>(props: HistoryProps<T>) => {
   if (props.problemStates.length == 0) return null;
 
   function reloadState(state: ProblemState<T>) {
-    props.setContent(state.content);
-    props.loadSolution(state.solutionIds);
+    props.onRequestRollback(state);
   }
 
   return (
diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index b989b26..98c468d 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -1,12 +1,12 @@
 import { Box, Center, HStack } from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import { History } from "./History";
-import { GoButton } from "./buttons/GoButton";
-import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
-import { SolutionView } from "./SolutionView";
-import { Container } from "../Container";
+import { useEffect, useState } from "react";
 import { Solution } from "../../api/data-model/Solution";
 import { SolveRequest } from "../../api/data-model/SolveRequest";
+import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
+import { Container } from "../Container";
+import { GoButton } from "./buttons/GoButton";
+import { History } from "./History";
+import { SolutionView } from "./SolutionView";
 import { SolverPicker } from "./SolverPicker";
 
 export interface ProblemState<T> {
@@ -154,8 +154,10 @@ export const ProgressHandler = <T extends {}>(
 
       <History
         problemStates={problemStates}
-        loadSolution={loadSolution}
-        setContent={props.setProblemInput}
+        onRequestRollback={(problemState) => {
+          props.setProblemInput(problemState.content);
+          loadSolution(problemState.solutionIds);
+        }}
       />
     </Container>
   );

From b1d51b2e44a7216d78efddc08b5c48f3151cb346 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 13:49:40 +0100
Subject: [PATCH 18/24] Rename content to problemInput

---
 src/components/solvers/History.tsx         | 8 ++++----
 src/components/solvers/ProgressHandler.tsx | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
index 6273e24..685afb5 100644
--- a/src/components/solvers/History.tsx
+++ b/src/components/solvers/History.tsx
@@ -29,17 +29,17 @@ export const History = <T extends {}>(props: HistoryProps<T>) => {
       </Heading>
       <List>
         {props.problemStates.map((x) => {
-          let contentString = x.content.toString();
+          let problemString = x.problemInput.toString();
           return (
-            <ListItem key={contentString}>
-              <Tooltip label={contentString}>
+            <ListItem key={problemString}>
+              <Tooltip label={problemString}>
                 <Button
                   width="200px"
                   overflow="hidden"
                   variant="link"
                   onClick={(_) => reloadState(x)}
                 >
-                  {contentString}
+                  {problemString}
                 </Button>
               </Tooltip>
               <Divider />
diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index 98c468d..b7a9066 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -13,7 +13,7 @@ export interface ProblemState<T> {
   /**
    * Problem input
    */
-  content: T;
+  problemInput: T;
   /**
    * Ids of the solutions of the problem input per problem type
    */
@@ -88,7 +88,7 @@ export const ProgressHandler = <T extends {}>(
       }, {} as ProblemTypeSolutionId);
 
       let newProblemState: ProblemState<T> = {
-        content: props.problemInput,
+        problemInput: props.problemInput,
         solutionIds: solutionIdMap,
       };
 
@@ -155,7 +155,7 @@ export const ProgressHandler = <T extends {}>(
       <History
         problemStates={problemStates}
         onRequestRollback={(problemState) => {
-          props.setProblemInput(problemState.content);
+          props.setProblemInput(problemState.problemInput);
           loadSolution(problemState.solutionIds);
         }}
       />

From a516efc26017f81b60b7f0614aed325a89fe6044 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 14:17:57 +0100
Subject: [PATCH 19/24] Rename setText to onTextChanged

---
 src/components/solvers/TextInputMask.tsx | 10 ++++------
 src/pages/solve/FeatureModelAnomaly.tsx  |  6 +++---
 src/pages/solve/MaxCut.tsx               |  6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/solvers/TextInputMask.tsx b/src/components/solvers/TextInputMask.tsx
index a4b3329..8d83f93 100644
--- a/src/components/solvers/TextInputMask.tsx
+++ b/src/components/solvers/TextInputMask.tsx
@@ -1,15 +1,13 @@
-import { Divider, Text, Textarea } from "@chakra-ui/react";
+import { Divider, Textarea } from "@chakra-ui/react";
 import Head from "next/head";
-import React, { ReactElement, useState } from "react";
+import { ReactElement, useState } from "react";
 import { Container } from "../Container";
-import { Main } from "../Main";
-import { Help } from "./SAT/Help";
 import { EditorControls } from "./EditorControls";
 
 export interface TextInputMaskProperties {
   textPlaceholder: string;
   text: string;
-  setText: (value: string) => void;
+  onTextChanged: (value: string) => void;
   body?: ReactElement;
 }
 
@@ -18,7 +16,7 @@ export const TextInputMask = (props: TextInputMaskProperties) => {
 
   function onTextChanged(text: string): void {
     try {
-      props.setText(text);
+      props.onTextChanged(text);
 
       setErrorString("");
     } catch (e: any) {
diff --git a/src/pages/solve/FeatureModelAnomaly.tsx b/src/pages/solve/FeatureModelAnomaly.tsx
index c63fadc..cf35292 100644
--- a/src/pages/solve/FeatureModelAnomaly.tsx
+++ b/src/pages/solve/FeatureModelAnomaly.tsx
@@ -8,11 +8,11 @@ import {
   VStack,
 } from "@chakra-ui/react";
 import { NextPage } from "next";
-import React, { useState } from "react";
+import { useState } from "react";
 import { MultiSelect, Option } from "react-multi-select-component";
+import { Layout } from "../../components/layout/Layout";
 import { ProgressHandler } from "../../components/solvers/ProgressHandler";
 import { TextInputMask } from "../../components/solvers/TextInputMask";
-import { Layout } from "../../components/layout/Layout";
 
 const anomalies: Option[] = [
   {
@@ -52,7 +52,7 @@ const FeatureModelAnomaly: NextPage = () => {
 
       <TextInputMask
         text={uvl}
-        setText={setUvl}
+        onTextChanged={setUvl}
         textPlaceholder="Enter your feature model in UVL format"
         body={
           <VStack>
diff --git a/src/pages/solve/MaxCut.tsx b/src/pages/solve/MaxCut.tsx
index 1790e6c..d3ca04c 100644
--- a/src/pages/solve/MaxCut.tsx
+++ b/src/pages/solve/MaxCut.tsx
@@ -8,13 +8,13 @@ import {
   Text,
 } from "@chakra-ui/react";
 import { NextPage } from "next";
-import React, { useState } from "react";
+import { useState } from "react";
 import { Container } from "../../components/Container";
+import { Layout } from "../../components/layout/Layout";
 import { GraphArea } from "../../components/solvers/Graph/GraphArea";
 import { ProgressHandler } from "../../components/solvers/ProgressHandler";
 import { TextInputMask } from "../../components/solvers/TextInputMask";
 import { parseGML } from "../../converter/graph/gml/GmlParser";
-import { Layout } from "../../components/layout/Layout";
 
 const MaxCut: NextPage = () => {
   const [graphData, setGraphData] = useState<any>(null);
@@ -48,7 +48,7 @@ const MaxCut: NextPage = () => {
       <TextInputMask
         textPlaceholder="Enter your graph in GML format"
         text={graphString}
-        setText={change}
+        onTextChanged={change}
         body={
           <Container>
             <Center>

From fb71ba4d01ce58972366a80e85c495284d9c1f97 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 16:19:15 +0100
Subject: [PATCH 20/24] Extract history storage to own file

---
 src/components/solvers/History.tsx         |  2 +-
 src/components/solvers/HistoryStorage.ts   | 30 ++++++++++++++++++++++
 src/components/solvers/ProgressHandler.tsx | 29 +++++----------------
 3 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 src/components/solvers/HistoryStorage.ts

diff --git a/src/components/solvers/History.tsx b/src/components/solvers/History.tsx
index 685afb5..6e8ea84 100644
--- a/src/components/solvers/History.tsx
+++ b/src/components/solvers/History.tsx
@@ -7,7 +7,7 @@ import {
   Stack,
   Tooltip,
 } from "@chakra-ui/react";
-import { ProblemState } from "./ProgressHandler";
+import { ProblemState } from "./HistoryStorage";
 
 interface HistoryProps<T> {
   problemStates: ProblemState<T>[];
diff --git a/src/components/solvers/HistoryStorage.ts b/src/components/solvers/HistoryStorage.ts
new file mode 100644
index 0000000..7ef9e52
--- /dev/null
+++ b/src/components/solvers/HistoryStorage.ts
@@ -0,0 +1,30 @@
+import { ProblemTypeSolutionId } from "./ProgressHandler";
+
+export interface ProblemState<T> {
+  /**
+   * Problem input
+   */
+  problemInput: T;
+  /**
+   * Ids of the solutions of the problem input per problem type
+   */
+  solutionIds: ProblemTypeSolutionId;
+}
+
+export function getHistory<T>(problemTypes: string[]): ProblemState<T>[] {
+  let historyItem = localStorage.getItem(getStoreId(problemTypes));
+  if (historyItem === null) return [];
+
+  return JSON.parse(historyItem);
+}
+
+export function storeHistory<T>(
+  problemTypes: string[],
+  history: ProblemState<T>[]
+) {
+  localStorage.setItem(getStoreId(problemTypes), JSON.stringify(history));
+}
+
+export function getStoreId(problemTypes: string[]) {
+  return `problemStates-${problemTypes}`;
+}
diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index b7a9066..662598d 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -6,20 +6,10 @@ import { fetchSolution, postProblem } from "../../api/ToolboxAPI";
 import { Container } from "../Container";
 import { GoButton } from "./buttons/GoButton";
 import { History } from "./History";
+import { getHistory, ProblemState, storeHistory } from "./HistoryStorage";
 import { SolutionView } from "./SolutionView";
 import { SolverPicker } from "./SolverPicker";
 
-export interface ProblemState<T> {
-  /**
-   * Problem input
-   */
-  problemInput: T;
-  /**
-   * Ids of the solutions of the problem input per problem type
-   */
-  solutionIds: ProblemTypeSolutionId;
-}
-
 export type ProblemTypeSolutionId = {
   [problemTypeId: string]: number;
 };
@@ -36,8 +26,6 @@ export interface ProgressHandlerProps<T> {
 export const ProgressHandler = <T extends {}>(
   props: ProgressHandlerProps<T>
 ) => {
-  const historyItemName: string = `problemStates-${props.problemTypes}`;
-
   const [wasClicked, setClicked] = useState<boolean>(false);
   const [finished, setFinished] = useState<boolean>(false);
   const [solutions, setSolutions] = useState<Solution[]>();
@@ -50,19 +38,16 @@ export const ProgressHandler = <T extends {}>(
   useEffect(() => {
     // Handle problem states from local storage
     if (problemStates.length == 0) {
-      let historyItem = localStorage.getItem(historyItemName);
-      if (historyItem == null) return;
-
-      let storageStates = JSON.parse(historyItem);
-      if (storageStates.length > 0) {
-        setProblemStates(storageStates);
+      let history = getHistory<T>(props.problemTypes);
+      if (history.length > 0) {
+        setProblemStates(history);
       }
     }
-  }, [problemStates, historyItemName]);
+  }, [problemStates, props.problemTypes]);
 
   useEffect(() => {
-    localStorage.setItem(historyItemName, JSON.stringify(problemStates));
-  }, [historyItemName, problemStates]);
+    storeHistory(props.problemTypes, problemStates);
+  }, [problemStates, props.problemTypes]);
 
   async function getSolution() {
     setClicked(true);

From 3be04be43c699a0531eb44d20a901d9c27384b30 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 16:20:14 +0100
Subject: [PATCH 21/24] Rename getSolution to startSolving

---
 src/components/solvers/ProgressHandler.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index 662598d..cef777b 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -49,7 +49,7 @@ export const ProgressHandler = <T extends {}>(
     storeHistory(props.problemTypes, problemStates);
   }, [problemStates, props.problemTypes]);
 
-  async function getSolution() {
+  async function startSolving() {
     setClicked(true);
     setFinished(false);
 
@@ -116,7 +116,7 @@ export const ProgressHandler = <T extends {}>(
             />
           ))}
           <Center>
-            <GoButton clicked={getSolution} />
+            <GoButton clicked={startSolving} />
           </Center>
         </HStack>
       ) : null}

From 53e60be45c8aefaa19bae1773316f3063eabff5d Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 16:21:21 +0100
Subject: [PATCH 22/24] Rename ProblemTypeSolutionId to SolutionIds

---
 src/components/solvers/HistoryStorage.ts   | 4 ++--
 src/components/solvers/ProgressHandler.tsx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/solvers/HistoryStorage.ts b/src/components/solvers/HistoryStorage.ts
index 7ef9e52..5fc8265 100644
--- a/src/components/solvers/HistoryStorage.ts
+++ b/src/components/solvers/HistoryStorage.ts
@@ -1,4 +1,4 @@
-import { ProblemTypeSolutionId } from "./ProgressHandler";
+import { SolutionIds } from "./ProgressHandler";
 
 export interface ProblemState<T> {
   /**
@@ -8,7 +8,7 @@ export interface ProblemState<T> {
   /**
    * Ids of the solutions of the problem input per problem type
    */
-  solutionIds: ProblemTypeSolutionId;
+  solutionIds: SolutionIds;
 }
 
 export function getHistory<T>(problemTypes: string[]): ProblemState<T>[] {
diff --git a/src/components/solvers/ProgressHandler.tsx b/src/components/solvers/ProgressHandler.tsx
index cef777b..2ade649 100644
--- a/src/components/solvers/ProgressHandler.tsx
+++ b/src/components/solvers/ProgressHandler.tsx
@@ -10,7 +10,7 @@ import { getHistory, ProblemState, storeHistory } from "./HistoryStorage";
 import { SolutionView } from "./SolutionView";
 import { SolverPicker } from "./SolverPicker";
 
-export type ProblemTypeSolutionId = {
+export type SolutionIds = {
   [problemTypeId: string]: number;
 };
 
@@ -70,7 +70,7 @@ export const ProgressHandler = <T extends {}>(
       let solutionIdMap = result.reduce((acc, item) => {
         acc[item.problemType] = item.solution.id;
         return acc;
-      }, {} as ProblemTypeSolutionId);
+      }, {} as SolutionIds);
 
       let newProblemState: ProblemState<T> = {
         problemInput: props.problemInput,
@@ -83,7 +83,7 @@ export const ProgressHandler = <T extends {}>(
     });
   }
 
-  async function loadSolution(ids: ProblemTypeSolutionId) {
+  async function loadSolution(ids: SolutionIds) {
     setClicked(true);
     setFinished(false);
 

From 2f5b411376dda9e1a3deac27b44b74a91ea5f56c Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 16:25:46 +0100
Subject: [PATCH 23/24] Remove code that is commented out

---
 .../dimacs/DimacsLogicalExpression.spec.ts    | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts b/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
index 71ecf8b..0382853 100644
--- a/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
+++ b/__tests__/converter/dimacs/DimacsLogicalExpression.spec.ts
@@ -1,8 +1,7 @@
 import each from "jest-each";
-import { regexBlank } from "../../../src/converter/dimacs/Syntax/CommonSyntax";
 import { DimacsParser } from "../../../src/converter/dimacs/DimacsParser";
+import { regexBlank } from "../../../src/converter/dimacs/Syntax/CommonSyntax";
 import { regexComment } from "../../../src/converter/dimacs/Syntax/DimacsSyntax";
-import { LogicalExpressionParser } from "../../../src/converter/dimacs/LogicalExpressionParser";
 import { regexNOT } from "../../../src/converter/dimacs/Syntax/LogicalExpressionSyntax";
 
 function isEquivalentLogicalExpression(f1: string, f2: string) {
@@ -19,36 +18,6 @@ function isEquivalentDimacs(f1: string, f2: string) {
 
 describe("Parsing", () => {
   let dimacsParser = new DimacsParser();
-  let logicalExpressionParser = new LogicalExpressionParser();
-
-  /*each([
-    [
-      "((1 or 2 or not 3) and (!4 and (not 5 and 6)) and 3 and (7 or 2))",
-      "c First comment\nc Some Comment\nc 1 => 1\np sat 7\n*(+( 1  2  -3 )*( -4 *( -5  6 )) 3 +( 7  2 ))",
-    ],
-    [
-      "(1 or (2 and 3) or (((1 and 4) or 5) and 6))",
-      "p sat 6\n+(1 *(2  3)*(+(*(1  4) 5) 6))",
-    ],
-    [
-      "(((1 and not 2 and 3 and 4) or 3) and 5)",
-      "c Sample DIMACS .sat file\np sat 5\n*(+(*(1  -2  3  4) 3) 5)",
-    ],
-    ["((1 and not 2) or 3)", "p sat 3\n+(*(1 -2) 3)"],
-    ["((1 and 2) or not 3)", "p sat 3\n+(*(1 2) -3)"],
-  ]).test(
-    "parsing bi-directional",
-    (logicalExpression: string, dimacs: string) => {
-      isEquivalentDimacs(
-        logicalExpressionParser.parseDimacs(logicalExpression),
-        dimacs
-      );
-      isEquivalentLogicalExpression(
-        dimacsParser.parseLogicalExpression(dimacs),
-        logicalExpression
-      );
-    }
-  );*/
 
   each([
     [

From de8cfb8de498e610832f2bb1b50286310ba2fd22 Mon Sep 17 00:00:00 2001
From: nickp <nickposer2102@gmail.com>
Date: Tue, 23 Jan 2024 16:26:03 +0100
Subject: [PATCH 24/24] Remove unused import

---
 src/components/solvers/SAT/TextArea.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/solvers/SAT/TextArea.tsx b/src/components/solvers/SAT/TextArea.tsx
index 57ebe48..43db5dd 100644
--- a/src/components/solvers/SAT/TextArea.tsx
+++ b/src/components/solvers/SAT/TextArea.tsx
@@ -1,8 +1,7 @@
+import { Box } from "@chakra-ui/react";
+import { highlight } from "prismjs";
 import "prismjs/themes/prism-solarizedlight.css"; //TODO: use custom styling
-import React from "react";
 import Editor from "react-simple-code-editor";
-import { highlight } from "prismjs";
-import { Box, Container } from "@chakra-ui/react";
 import { SAT_language } from "./prism-SAT";
 
 interface TextAreaProps {