Adding language switching and minimize button (#25)
* Initial Push
Inititial project state
* Static demo version
* static demo site - added variables
a
* first_implementation
* Updated UI, Improved Style to be more "Reactly", added Functionality
* add parsing functions
* change folder
* Import/Export Prototype
* Adding "reactjs-popup" to package,json
* Adding GLPK source
* Rough implementation of solver + example
* Show solution in output
* example 2 + popup lib
* removing import button
This feature won't be needed in this state of the project and might come back later. Right now it serves no functional purpose.
* Removing "Popout" button
This feature won't be needed in this state of the project and might come back later. Right now it serves no functional purpose.
* Updating Logs
Now the site displays all logs created with customLog(STRING). Logs can be cleared with customLogClear();
* Adding walltime
Can be called using:
Start:
function walltimeStart() {
returns Date.now();
Stop:
function walltimeStopAndPrint(startpoint: number) {
Add startpoint as argument.
It prints the elapsed time using customLog()
* Adding duals ouput
* Adding glpk.js package
required dependency
* adding LP format export and fixing a few errors
* fixing further errors
* adding automatic build
* Moving files to correct folders
* Update nextjs.yml
* Updating README and .gitignore
README:
- added installation instructions
- added troubleshooting
gitignore:
- skipping Writerside and .idea folders
* Update LICENCE.txt
We are required to use the same license. See https://github.com/hgourvest/node-glpk/blob/master/LICENSE
* Updating icon
* Adding RegEx input checks and updating text box explanations
* Update README.md
Updating license info
Signed-off-by: SinusFox <61253950+SinusFox@users.noreply.github.com>
* Deleting license to recreate proper license
* Update layout.tsx
fixing typo
Signed-off-by: SinusFox <61253950+SinusFox@users.noreply.github.com>
* Fixing word issue
English has some false friends... like the German "Enter" is actually return in English.
* Updatint License
* Fixing design issue and updating license link
* Fixing typo in log
* Fixing white mode
* adding translations 1/2
UI Translations
Coming in 2/2: Output translations
* adding output translations
* adding minimize button
---------
Signed-off-by: SinusFox <61253950+SinusFox@users.noreply.github.com>
Co-authored-by: moebiusl <lucas.moebius@icloud.com>
Co-authored-by: Marcel Pöppe <marcel.poeppe@gmail.com>
This commit is contained in:
+17
-3
@@ -3,8 +3,8 @@
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
--background: #ffffff;
|
||||
--foreground: #171717;
|
||||
--background: #171717;
|
||||
--foreground: #ffffff;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
@@ -157,4 +157,18 @@ body {
|
||||
|
||||
.popup-overlay {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
.dropdown-custom {
|
||||
width: 20%;
|
||||
background-color: black;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.dropdown-custom:hover {
|
||||
background-color: #444;
|
||||
}
|
||||
|
||||
+204
@@ -0,0 +1,204 @@
|
||||
export default function text(lang: string, input: string): string {
|
||||
// German translation
|
||||
if (lang === "ger") {
|
||||
switch (input) {
|
||||
case "header_title":
|
||||
return "OR-Tool";
|
||||
case "header_subtitle":
|
||||
return "von Spaceholder Programming";
|
||||
case "boxObjTitle":
|
||||
return "Ziel";
|
||||
case "boxObjDesc":
|
||||
return "Geben Sie Ihr Ziel hier ein. Es ist nur ein Ziel erlaubt. Verwenden Sie eine Zeile dafür (kein 'Enter'!). Erlaubte Symbole sind 0-9, a-z, A-Z und <>=.\nBeispiel:\nx + y\n-786433 x1 + 655361 x2";
|
||||
case "boxSubjTitle":
|
||||
return "Nebenbedingungen";
|
||||
case "boxSubjDesc":
|
||||
return "Geben Sie Ihre Nebenbedingungen hier ein. Eine pro Zeile (mit der 'Enter'-Taste trennen). Erlaubte Symbole sind 0-9, a-z, A-Z und <>=.\nBeispiel:\n+1 x + 2 y <= 15\n524321 x14 + 524305 x15 <= 4194303.5";
|
||||
case "boxBoundsTitle":
|
||||
return "Grenzen";
|
||||
case "boxBoundsDesc":
|
||||
return "Geben Sie Ihre Grenzen hier ein. Eine pro Zeile (mit der 'Enter'-Taste trennen). Erlaubte Symbole sind 0-9, a-z, A-Z und <>=.\nBeispiel:\nx >= 0\nx > 0\n0 <= x1 <= 1";
|
||||
case "boxVarsTitle":
|
||||
return "Variablen";
|
||||
case "boxVarsDesc":
|
||||
return "Listen Sie alle Ihre Variablen auf. Eine pro Zeile (mit der 'Enter'-Taste trennen). Erlaubte Symbole sind a-z, A-Z.\nBeispiel:\nx\ny";
|
||||
case "boxExportLP":
|
||||
return "Als LP exportieren";
|
||||
case "boxOut":
|
||||
return "Geben Sie ein Problem ein und drücken Sie eine Aktionstaste, um die Ausgabe anzuzeigen...";
|
||||
case "buttonCalc":
|
||||
return "Berechnen";
|
||||
case "etime":
|
||||
return "Berechnungsdauer";
|
||||
case "seconds":
|
||||
return "Sekunden";
|
||||
case "err_invalidInput":
|
||||
return "Fehler: Ungültige Eingabe in";
|
||||
case "err_nullInput":
|
||||
return "Fehler: NULL- oder undefinierte Eingabe in";
|
||||
case "err_invalidInput":
|
||||
return "Fehler: Ungültige Eingabe oder fehlendes Zeichen in";
|
||||
case "input_checks_successful":
|
||||
return "Alle Eingabeprüfungen erfolgreich.";
|
||||
case "input_checks_start":
|
||||
return "Starte Eingabeprüfungen...";
|
||||
case "obj_box":
|
||||
return "Zielfeld";
|
||||
case "subj_box":
|
||||
return "Bedingungsfeld";
|
||||
case "bounds_box":
|
||||
return "Grenzenfeld";
|
||||
case "vars_box":
|
||||
return "Variablenfeld";
|
||||
case "err_emptyBox":
|
||||
return "Fehler: Leeres Textfeld.";
|
||||
case "calculating":
|
||||
return "Berechne...";
|
||||
case "maximize":
|
||||
return "Maximieren";
|
||||
case "minimize":
|
||||
return "Minimieren";
|
||||
case "run_optimization":
|
||||
return "Optimierung mit Eingaben wird ausgeführt";
|
||||
case "startProblemSetup":
|
||||
return "Starte Problemerstellung...";
|
||||
case "succProblemSetup":
|
||||
return "Problem erstellt.";
|
||||
case "startScaling":
|
||||
return "Skalieren des Problems...";
|
||||
case "succScaling":
|
||||
return "Skalierung erfolgreich.";
|
||||
case "startOptimizationSimplex":
|
||||
return "Starte Simplex-Optimierung...";
|
||||
case "succOptimizationSimplex":
|
||||
return "Simplex-Optimierung abgeschlossen.";
|
||||
case "startOptimizationInteger":
|
||||
return "Starte Ganzzahloptimierung...";
|
||||
case "succOptimizationInteger":
|
||||
return "Ganzzahloptimierung abgeschlossen.";
|
||||
case "finalObjValue":
|
||||
return "Endgültiger Zielfunktionswert";
|
||||
case "varsValues":
|
||||
return "Wert jeder Variable";
|
||||
case "dualValues":
|
||||
return "Dualwerte der Einschränkungen";
|
||||
case "downloadPrepFileString":
|
||||
return "Dateiinhalt wird vorbereitet...";
|
||||
case "downloadPrepFile":
|
||||
return "Datei wird vorbereitet...";
|
||||
case "downloadStart":
|
||||
return "Download wird gestartet.";
|
||||
case "downloadPrep":
|
||||
return "Download wird vorbereitet...";
|
||||
case "downloadFetchInput":
|
||||
return "Eingaben werden geladen...";
|
||||
case "importing":
|
||||
return "Importiere...";
|
||||
default:
|
||||
return input;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// English translation
|
||||
if (lang === "eng") {
|
||||
switch (input) {
|
||||
case "header_title":
|
||||
return "OR-Tool";
|
||||
case "header_subtitle":
|
||||
return "by Spaceholder Programming";
|
||||
case "boxObjTitle":
|
||||
return "Objective";
|
||||
case "boxObjDesc":
|
||||
return "Insert your objective here. One objective is allowed. Use one line for it (no \"return\"!) Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx + y\n-786433 x1 + 655361 x2";
|
||||
case "boxSubjTitle":
|
||||
return "Subject";
|
||||
case "boxSubjDesc":
|
||||
return "Insert your subject here. One per line (divide by 'return' button). Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\n+1 x + 2 y <= 15\n524321 x14 + 524305 x15 <= 4194303.5";
|
||||
case "boxBoundsTitle":
|
||||
return "Bounds";
|
||||
case "boxBoundsDesc":
|
||||
return "Insert your bounds here. One per line (divide by 'return' button). Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx >= 0\nx > 0\n0 <= x1 <= 1";
|
||||
case "boxVarsTitle":
|
||||
return "Variables";
|
||||
case "boxVarsDesc":
|
||||
return "List all your variables. One per line (divide by 'return' button). Allowed symbols are a-z, A-Z.\nExample:\nx\ny";
|
||||
case "boxExportLP":
|
||||
return "Export as LP";
|
||||
case "boxOut":
|
||||
return "Input a problem and an action button to display output...";
|
||||
case "buttonCalc":
|
||||
return "Calculate";
|
||||
case "etime":
|
||||
return "Elapsed time";
|
||||
case "seconds":
|
||||
return "seconds";
|
||||
case "err_invalidInput":
|
||||
return "Error: Invalid input in";
|
||||
case "err_nullInput":
|
||||
return "Error: NULL or undefined input in";
|
||||
case "err_invalidInput":
|
||||
return "Error: Invalid input or missing character in";
|
||||
case "input_checks_successful":
|
||||
return "All input checks successful."
|
||||
case "input_checks_start":
|
||||
return "Starting input checks...";
|
||||
case "obj_box":
|
||||
return "object box";
|
||||
case "subj_box":
|
||||
return "subject box";
|
||||
case "bounds_box":
|
||||
return "bounds box";
|
||||
case "vars_box":
|
||||
return "variables box";
|
||||
case "err_emptyBox":
|
||||
return "Error: Empty text box.";
|
||||
case "calculating":
|
||||
return "Calculating...";
|
||||
case "maximize":
|
||||
return "Maximize";
|
||||
case "minimize":
|
||||
return "Minimize";
|
||||
case "run_optimization":
|
||||
return "Running optimization with input";
|
||||
case "startProblemSetup":
|
||||
return "Starting problem setup...";
|
||||
case "succProblemSetup":
|
||||
return "Problem created.";
|
||||
case "startScaling":
|
||||
return "Scaling problem...";
|
||||
case "succScaling":
|
||||
return "Scaling successful.";
|
||||
case "startOptimizationSimplex":
|
||||
return "Starting simplex optimization...";
|
||||
case "succOptimizationSimplex":
|
||||
return "Simplex optimization complete.";
|
||||
case "startOptimizationInteger":
|
||||
return "Starting integer optimization...";
|
||||
case "succOptimizationInteger":
|
||||
return "Integer optimization complete.";
|
||||
case "finalObjValue":
|
||||
return "Final objective value";
|
||||
case "varsValues":
|
||||
return "Value of each variable";
|
||||
case "dualValues":
|
||||
return "Dual values of constraints";
|
||||
case "downloadPrepFileString":
|
||||
return "Preparing file content string...";
|
||||
case "downloadPrepFile":
|
||||
return "Preparing file...";
|
||||
case "downloadStart":
|
||||
return "Starting download.";
|
||||
case "downloadPrep":
|
||||
return "Preparing download...";
|
||||
case "downloadFetchInput":
|
||||
return "Fetching input...";
|
||||
case "importing":
|
||||
return "Importing...";
|
||||
default:
|
||||
return input;
|
||||
}
|
||||
}
|
||||
|
||||
return "Error: Translation Module - Language Not Known.";
|
||||
}
|
||||
+3
-3
@@ -45,7 +45,7 @@ export default function RootLayout({
|
||||
width={16}
|
||||
height={16}
|
||||
/>
|
||||
Go to our docs
|
||||
Docs
|
||||
</a>
|
||||
<a
|
||||
className="flex items-center gap-2 hover:underline hover:underline-offset-4"
|
||||
@@ -60,7 +60,7 @@ export default function RootLayout({
|
||||
width={16}
|
||||
height={16}
|
||||
/>
|
||||
See the source code
|
||||
Source Code
|
||||
</a>
|
||||
<a
|
||||
className="flex items-center gap-2 hover:underline hover:underline-offset-4"
|
||||
@@ -75,7 +75,7 @@ export default function RootLayout({
|
||||
width={16}
|
||||
height={16}
|
||||
/>
|
||||
Powered by GLPK
|
||||
GLPK
|
||||
</a>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
+49
-27
@@ -1,58 +1,80 @@
|
||||
'use client'
|
||||
|
||||
import React, { useState } from 'react';
|
||||
import { Box, Button, Output } from "./modules";
|
||||
import { calculate_click, downloadLP, import_click } from "./scripts"
|
||||
import { calculate_clickMaximize, calculate_clickMinimize, downloadLP, import_click } from "./scripts"
|
||||
import text from "./lang"
|
||||
|
||||
export default function Home() {
|
||||
const [language, setLanguage] = useState('eng');
|
||||
const tr_hTitle = text(language, 'header_title');
|
||||
const tr_hSubtitle = text(language, 'header_subtitle');
|
||||
const tr_boxObjTitle = text(language, 'boxObjTitle');
|
||||
const tr_boxObjDesc = text(language, "boxObjDesc");
|
||||
const tr_boxSubjTitle = text(language, 'boxSubjTitle');
|
||||
const tr_boxSubjDesc = text(language, "boxSubjDesc");
|
||||
const tr_boxBoundsTitle = text(language, 'boxBoundsTitle');
|
||||
const tr_boxBoundsDesc = text(language, "boxBoundsDesc");
|
||||
const tr_boxVarsTitle = text(language, 'boxVarsTitle');
|
||||
const tr_boxVarsDesc = text(language, "boxVarsDesc");
|
||||
const tr_boxOut = text(language, "boxOut");
|
||||
const tr_boxExportLP = text(language, "boxExportLP");
|
||||
const tr_calc_max = text(language, "maximize");
|
||||
const tr_calc_min = text(language, "minimize");
|
||||
|
||||
const handleLanguageChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
|
||||
setLanguage(event.target.value);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<header className="header">
|
||||
<div className="title">
|
||||
<main className="header_box">
|
||||
Operations Research Tool
|
||||
{tr_hTitle}
|
||||
<br></br>
|
||||
<span className="header_copyright">
|
||||
<i>by Spaceholder Programming</i>
|
||||
</span>
|
||||
<i>{tr_hSubtitle}</i>
|
||||
</span><br></br>
|
||||
<select id="language_current" value={language} onChange={handleLanguageChange} className="dropdown-custom">
|
||||
<option value="ger">Deutsch</option>
|
||||
<option value="eng">English</option>
|
||||
</select>
|
||||
</main>
|
||||
</div>
|
||||
</header>
|
||||
<Box
|
||||
title={"Objective"}
|
||||
placeholder={"Insert your objective here. One objective is allowed. Use one line for it (no \"return\"!) Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx + y\n-786433 x1 + 655361 x2"}
|
||||
id="objective"/>
|
||||
title={tr_boxObjTitle}
|
||||
placeholder={tr_boxObjDesc}
|
||||
id="objective" />
|
||||
<Box
|
||||
title={"Subject"}
|
||||
placeholder={"Insert your subject here. One per line (divide by 'return' 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"/>
|
||||
title={tr_boxSubjTitle}
|
||||
placeholder={tr_boxSubjDesc}
|
||||
id="subject" />
|
||||
<Box
|
||||
title={"Bounds"}
|
||||
placeholder={"Insert your bounds here. One per line (divide by 'return' button). Allowed symbols are 0-9, a-z, A-Z and <>=.\nExample:\nx >= 0\nx > 0\n0 <= x1 <= 1"}
|
||||
id="bounds"/>
|
||||
title={tr_boxBoundsTitle}
|
||||
placeholder={tr_boxBoundsDesc}
|
||||
id="bounds" />
|
||||
<Box
|
||||
title={"Variables"}
|
||||
placeholder={"List all your variables. One per line (divide by 'return' button). Allowed symbols are a-z, A-Z.\nExample:\nx\ny"}
|
||||
title={tr_boxVarsTitle}
|
||||
placeholder={tr_boxVarsDesc}
|
||||
id="vars" />
|
||||
<Button
|
||||
title={"Calculate"}
|
||||
title={tr_calc_max}
|
||||
className={"button_green"}
|
||||
onClickFunc={calculate_click} />
|
||||
{/* <Popup_Button
|
||||
title={"Import"}
|
||||
className={"button"} /> */}
|
||||
onClickFunc={calculate_clickMaximize} />
|
||||
<Button
|
||||
title={"Export as LP"}
|
||||
title={tr_calc_min}
|
||||
className={"button_green"}
|
||||
onClickFunc={calculate_clickMinimize} />
|
||||
<Button
|
||||
title={tr_boxExportLP}
|
||||
className={"button"}
|
||||
onClickFunc={downloadLP} />
|
||||
<br></br>
|
||||
<Output
|
||||
id="out"
|
||||
text={"Input a problem and an action button to display output..."}/>
|
||||
{/* <Popup_Button
|
||||
title="Popup"
|
||||
className="button"
|
||||
/> */}
|
||||
|
||||
text={tr_boxOut} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
+93
-56
@@ -5,13 +5,20 @@ import * as LPAPI from "../api/optimizeLP.js"
|
||||
import * as GLPKAPI from "../solver/glpk.min.js"
|
||||
import { start } from "repl";
|
||||
|
||||
import text from "./lang"
|
||||
|
||||
// custom log so we can append the output dynamically
|
||||
function customLog(message: string) {
|
||||
console.log(message); // Continue to print message inside of box
|
||||
function customLog(input: string) {
|
||||
// get language
|
||||
const lang = (document.getElementById('language_current') as HTMLSelectElement)?.value;
|
||||
|
||||
// Get Output Box
|
||||
const outputElement = document.getElementById('out');
|
||||
|
||||
// load text
|
||||
const message: string = text(lang, input);
|
||||
console.log(message); // Continue to print message inside of box
|
||||
|
||||
// Append message if element exists
|
||||
if (outputElement) {
|
||||
outputElement.innerHTML += message + "<br>"; // Append message
|
||||
@@ -25,6 +32,14 @@ function customLogClear() {
|
||||
}
|
||||
}
|
||||
|
||||
function getTranslation(input: string) {
|
||||
// get language
|
||||
const lang = (document.getElementById('language_current') as HTMLSelectElement)?.value;
|
||||
|
||||
// return translation
|
||||
return text(lang, input);
|
||||
}
|
||||
|
||||
function walltimeStopAndPrint(startpoint: number) {
|
||||
// calculating elapsed time as timestamp
|
||||
let duration = Date.now() - startpoint;
|
||||
@@ -37,7 +52,8 @@ function walltimeStopAndPrint(startpoint: number) {
|
||||
const durationFormatted = seconds + (milliseconds >= 0 ? "." : ".") + Math.abs(milliseconds).toFixed(3).slice(2);
|
||||
|
||||
// Printing elapsed time
|
||||
customLog("Elapsed time: " + durationFormatted + " seconds<br>");
|
||||
customLog(getTranslation("etime") + ": " + durationFormatted + " " + getTranslation("seconds"));
|
||||
customLog("");
|
||||
|
||||
// return durationFormatted;
|
||||
}
|
||||
@@ -47,11 +63,11 @@ function walltimeStart() {
|
||||
}
|
||||
|
||||
function isInputValidRegex(obj: string | undefined, subj: string | undefined, bounds: string | undefined, vars: string | undefined): boolean {
|
||||
customLog("Starting input checks...");
|
||||
|
||||
customLog("input_checks_start");
|
||||
|
||||
// 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.");
|
||||
if (obj === undefined || obj === null || subj === undefined || subj === null || bounds === undefined || bounds === null || vars === undefined || vars === null) {
|
||||
customLog(getTranslation("err_nullInput") + "function isInputValidRegex.");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,63 +75,64 @@ function isInputValidRegex(obj: string | undefined, subj: string | undefined, bo
|
||||
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;
|
||||
customLog(getTranslation("err_invalidInput") + " " + getTranslation("obj_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;
|
||||
customLog(getTranslation("err_invalidInput") + " " + getTranslation("subj_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.");
|
||||
// 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(getTranslation("err_invalidInput") + " " + getTranslation("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.");
|
||||
customLog(getTranslation("err_invalidInput") + " " + getTranslation("vars_box") + ".");
|
||||
return false;
|
||||
}
|
||||
|
||||
customLog("All input checks successful.");
|
||||
customLog("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.");
|
||||
customLog("err_emptyBox");
|
||||
return false;
|
||||
}
|
||||
if (subj == "" || subj == null || subj == undefined) {
|
||||
customLog("Error: Empty input field.");
|
||||
customLog("err_emptyBox");
|
||||
return false;
|
||||
}
|
||||
if (bounds == "" || bounds == null || bounds == undefined) {
|
||||
customLog("Error: Empty input field.");
|
||||
customLog("err_emptyBox");
|
||||
return false;
|
||||
}
|
||||
if (vars == "" || vars == null || vars == undefined) {
|
||||
customLog("Error: Empty input field.");
|
||||
customLog("err_emptyBox");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
export function calculate_click() {
|
||||
function calculate_click(maximize: boolean) {
|
||||
customLogClear();
|
||||
const timer = walltimeStart();
|
||||
customLog("Calculating...<br>");
|
||||
customLog("calculating");
|
||||
customLog("");
|
||||
|
||||
let objective: string | undefined;
|
||||
const objectiveElement = document.getElementById('objective');
|
||||
@@ -190,67 +207,78 @@ export function calculate_click() {
|
||||
|
||||
// console.log(parseFunction(decider));
|
||||
|
||||
|
||||
|
||||
// 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
|
||||
+ "\nGenerals \n" + variables
|
||||
+ "\nEnd";
|
||||
// fetch operator
|
||||
let operator = "Minimize";
|
||||
if (maximize) operator = "Maximize";
|
||||
|
||||
let wholeText: string = operator + "\n obj: " + objective
|
||||
+ "\nSubject To \n" + subject
|
||||
+ "\nBounds \n" + bounds
|
||||
+ "\nGenerals \n" + variables
|
||||
+ "\nEnd";
|
||||
|
||||
// customLog("<br><br>DEBUGGING<br><br>\nfunctions:<br>" + functions + "<br><br>variables:<br>" + variables + "<br><br>DEBUGGING END<br>");
|
||||
|
||||
customLog("Running optimization with input: \"" + wholeText + "\"<br>");
|
||||
customLog(getTranslation("run_optimization") + ": \"" + wholeText + "\"");
|
||||
customLog("");
|
||||
run(wholeText);
|
||||
|
||||
walltimeStopAndPrint(timer);
|
||||
}
|
||||
|
||||
function run(text: string) {
|
||||
customLog("Starting problem setup...");
|
||||
customLog("startProblemSetup");
|
||||
let lp = GLPKAPI.glp_create_prob();
|
||||
GLPKAPI.glp_read_lp_from_string(lp, null, text);
|
||||
customLog("Problem created.<br>");
|
||||
customLog("succProblemSetup");
|
||||
customLog("");
|
||||
|
||||
customLog("Scaling problem...");
|
||||
customLog("startScaling");
|
||||
GLPKAPI.glp_scale_prob(lp, GLPKAPI.GLP_SF_AUTO);
|
||||
customLog("Scaling complete.<br>");
|
||||
customLog("succScaling");
|
||||
customLog("");
|
||||
|
||||
customLog("Starting simplex optimization...");
|
||||
customLog("startOptimizationSimplex");
|
||||
let smcp = new GLPKAPI.SMCP({ presolve: GLPKAPI.GLP_ON });
|
||||
GLPKAPI.glp_simplex(lp, smcp);
|
||||
customLog("Simplex optimization complete.<br>");
|
||||
customLog("succOptimizationSimplex");
|
||||
customLog("");
|
||||
|
||||
customLog("Starting integer optimization...");
|
||||
customLog("startOptimizationInteger");
|
||||
let iocp = new GLPKAPI.IOCP({ presolve: GLPKAPI.GLP_ON });
|
||||
GLPKAPI.glp_intopt(lp, iocp);
|
||||
customLog("Integer optimization complete.<br>");
|
||||
customLog("succOptimizationInteger");
|
||||
customLog("");
|
||||
|
||||
// customLog("obj: " + GLPKAPI.glp_mip_obj_val(lp));
|
||||
customLog("<i>Final objective value: " + GLPKAPI.glp_mip_obj_val(lp) + "</i><br>");
|
||||
customLog("Value of each variable:");
|
||||
for (let i = 1; i <= GLPKAPI.glp_get_num_cols(lp) - 1; i++) { // "-1" to remove the "End-variable" from logs
|
||||
customLog("<i>" + getTranslation("finalObjValue") + ": " + GLPKAPI.glp_mip_obj_val(lp) + "</i>");
|
||||
customLog("");
|
||||
customLog(getTranslation("varsValues") + ":");
|
||||
for (let i = 1; i <= GLPKAPI.glp_get_num_cols(lp); i++) {
|
||||
customLog(GLPKAPI.glp_get_col_name(lp, i) + " = " + GLPKAPI.glp_mip_col_val(lp, i));
|
||||
}
|
||||
customLog("");
|
||||
|
||||
customLog("Dual values of constraints:");
|
||||
for (let j = 1; j <= GLPKAPI.glp_get_num_rows(lp); j++) {
|
||||
const dualValue = GLPKAPI.glp_get_row_dual(lp, j); // fetch dual
|
||||
const constraintName = GLPKAPI.glp_get_row_name(lp, j);
|
||||
customLog(constraintName + " dual = " + dualValue);
|
||||
}
|
||||
customLog(getTranslation("dualValues") + ":");
|
||||
for (let j = 1; j <= GLPKAPI.glp_get_num_rows(lp); j++) {
|
||||
const dualValue = GLPKAPI.glp_get_row_dual(lp, j); // fetch dual
|
||||
const constraintName = GLPKAPI.glp_get_row_name(lp, j);
|
||||
customLog(constraintName + " dual = " + dualValue);
|
||||
}
|
||||
customLog("");
|
||||
}
|
||||
|
||||
function downloadLPFormatting(objective: any, subject: any, bounds: any) {
|
||||
customLog("Preparing file content string...<br>");
|
||||
|
||||
customLog(getTranslation("downloadPrepFileString"));
|
||||
customLog("");
|
||||
|
||||
// ensure that all vars are strings
|
||||
const formattedObjective = typeof objective === 'string' ? objective : '';
|
||||
const formattedSubject = typeof subject === 'string' ? subject : '';
|
||||
@@ -274,23 +302,32 @@ function downloadLPFormatting(objective: any, subject: any, bounds: any) {
|
||||
return lpFormat;
|
||||
}
|
||||
|
||||
export function calculate_clickMaximize() {
|
||||
calculate_click(true);
|
||||
}
|
||||
|
||||
export function calculate_clickMinimize() {
|
||||
calculate_click(false);
|
||||
}
|
||||
|
||||
|
||||
function downloadProblemDownload(content: string) {
|
||||
customLog("Preparing file...<br>")
|
||||
customLog("downloadPrepFile");
|
||||
customLog("");
|
||||
const blob = new Blob([content], { type: 'text/plain' });
|
||||
const link = document.createElement('a');
|
||||
link.href = URL.createObjectURL(blob);
|
||||
link.download = 'problem.txt'; // file name
|
||||
link.click(); // starting download
|
||||
customLog("Starting download.")
|
||||
customLog("downloadStart");
|
||||
}
|
||||
|
||||
export function downloadLP() {
|
||||
customLogClear();
|
||||
customLog("Preparing download...<br>");
|
||||
customLog("Fetching input...<br>")
|
||||
customLog("downloadPrep");
|
||||
customLog("");
|
||||
customLog("downloadFetchInput");
|
||||
customLog("");
|
||||
|
||||
let objective: string | undefined;
|
||||
const objectiveElement = document.getElementById('objective');
|
||||
@@ -335,7 +372,7 @@ export function downloadLP() {
|
||||
|
||||
|
||||
export function import_click() {
|
||||
console.log("Importing...");
|
||||
console.log("importing");
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user