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:
SinusFox
Generated
+285
-5
@@ -9,9 +9,14 @@
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"glpk.js": "^4.0.2",
|
||||
"i18n": "^0.15.1",
|
||||
"i18next": "^23.15.2",
|
||||
"i18next-browser-languagedetector": "^8.0.0",
|
||||
"next": "14.2.11",
|
||||
"next-i18next": "^15.3.1",
|
||||
"react": "^18",
|
||||
"react-dom": "^18",
|
||||
"react-i18next": "^15.0.2",
|
||||
"react-popup": "^0.11.2",
|
||||
"reactjs-popup": "^2.0.6"
|
||||
},
|
||||
@@ -39,6 +44,18 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/runtime": {
|
||||
"version": "7.25.7",
|
||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
|
||||
"integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"regenerator-runtime": "^0.14.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@eslint-community/eslint-utils": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
|
||||
@@ -237,6 +254,50 @@
|
||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
||||
}
|
||||
},
|
||||
"node_modules/@messageformat/core": {
|
||||
"version": "3.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@messageformat/core/-/core-3.4.0.tgz",
|
||||
"integrity": "sha512-NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@messageformat/date-skeleton": "^1.0.0",
|
||||
"@messageformat/number-skeleton": "^1.0.0",
|
||||
"@messageformat/parser": "^5.1.0",
|
||||
"@messageformat/runtime": "^3.0.1",
|
||||
"make-plural": "^7.0.0",
|
||||
"safe-identifier": "^0.4.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@messageformat/date-skeleton": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz",
|
||||
"integrity": "sha512-rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@messageformat/number-skeleton": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz",
|
||||
"integrity": "sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@messageformat/parser": {
|
||||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.0.tgz",
|
||||
"integrity": "sha512-jKlkls3Gewgw6qMjKZ9SFfHUpdzEVdovKFtW1qRhJ3WI4FW5R/NnGDqr8SDGz+krWDO3ki94boMmQvGke1HwUQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"moo": "^0.5.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@messageformat/runtime": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@messageformat/runtime/-/runtime-3.0.1.tgz",
|
||||
"integrity": "sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"make-plural": "^7.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@next/env": {
|
||||
"version": "14.2.11",
|
||||
"resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.11.tgz",
|
||||
@@ -486,6 +547,16 @@
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/hoist-non-react-statics": {
|
||||
"version": "3.3.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
|
||||
"integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/react": "*",
|
||||
"hoist-non-react-statics": "^3.3.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/json-schema": {
|
||||
"version": "7.0.15",
|
||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||
@@ -514,14 +585,12 @@
|
||||
"version": "15.7.12",
|
||||
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
|
||||
"integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/react": {
|
||||
"version": "18.3.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
|
||||
"integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/prop-types": "*",
|
||||
@@ -1118,6 +1187,12 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/boolean": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
|
||||
"integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
@@ -1311,6 +1386,17 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/core-js": {
|
||||
"version": "3.38.1",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
|
||||
"integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/core-js"
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.3",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
||||
@@ -1343,7 +1429,6 @@
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/damerau-levenshtein": {
|
||||
@@ -1411,7 +1496,6 @@
|
||||
"version": "4.3.7",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
||||
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "^2.1.3"
|
||||
@@ -2268,6 +2352,18 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fast-printf": {
|
||||
"version": "1.6.9",
|
||||
"resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz",
|
||||
"integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"boolean": "^3.1.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/fastq": {
|
||||
"version": "1.17.1",
|
||||
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
|
||||
@@ -2721,6 +2817,82 @@
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/hoist-non-react-statics": {
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
|
||||
"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"react-is": "^16.7.0"
|
||||
}
|
||||
},
|
||||
"node_modules/html-parse-stringify": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
|
||||
"integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"void-elements": "3.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/i18n": {
|
||||
"version": "0.15.1",
|
||||
"resolved": "https://registry.npmjs.org/i18n/-/i18n-0.15.1.tgz",
|
||||
"integrity": "sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@messageformat/core": "^3.0.0",
|
||||
"debug": "^4.3.3",
|
||||
"fast-printf": "^1.6.9",
|
||||
"make-plural": "^7.0.0",
|
||||
"math-interval-parser": "^2.0.1",
|
||||
"mustache": "^4.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/mashpie"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next": {
|
||||
"version": "23.15.2",
|
||||
"resolved": "https://registry.npmjs.org/i18next/-/i18next-23.15.2.tgz",
|
||||
"integrity": "sha512-zcPSWzCvw6uKnuYHIqs4W7hTuB9e3AFcSdZgvCWoPXIZsBjBd4djN2/2uOHIB+1DFFkQnMBXvhNg7J3WyCuywQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com/i18next.html"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next-browser-languagedetector": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.0.tgz",
|
||||
"integrity": "sha512-zhXdJXTTCoG39QsrOCiOabnWj2jecouOqbchu3EfhtSHxIB5Uugnm9JaizenOy39h7ne3+fLikIjeW88+rgszw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next-fs-backend": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.2.tgz",
|
||||
"integrity": "sha512-LIwUlkqDZnUI8lnUxBnEj8K/FrHQTT/Sc+1rvDm9E8YvvY5YxzoEAASNx+W5M9DfD5s77lI5vSAFWeTp26B/3Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/ignore": {
|
||||
"version": "5.3.2",
|
||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||
@@ -3451,6 +3623,21 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/make-plural": {
|
||||
"version": "7.4.0",
|
||||
"resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.4.0.tgz",
|
||||
"integrity": "sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==",
|
||||
"license": "Unicode-DFS-2016"
|
||||
},
|
||||
"node_modules/math-interval-parser": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz",
|
||||
"integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/merge2": {
|
||||
"version": "1.4.1",
|
||||
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
|
||||
@@ -3508,13 +3695,27 @@
|
||||
"node": ">=16 || 14 >=14.17"
|
||||
}
|
||||
},
|
||||
"node_modules/moo": {
|
||||
"version": "0.5.2",
|
||||
"resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
|
||||
"integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/mustache": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
|
||||
"integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"mustache": "bin/mustache"
|
||||
}
|
||||
},
|
||||
"node_modules/mz": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
|
||||
@@ -3602,6 +3803,42 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/next-i18next": {
|
||||
"version": "15.3.1",
|
||||
"resolved": "https://registry.npmjs.org/next-i18next/-/next-i18next-15.3.1.tgz",
|
||||
"integrity": "sha512-+pa2pZJb7B6k5PKW3TLVMmAodqkNaOBWVYlpWX56mgcEJz0UMW+MKSdKM9Z72CHp6Bp48g7OWwDnLqxXNp/84w==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com/i18next.html"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2",
|
||||
"@types/hoist-non-react-statics": "^3.3.4",
|
||||
"core-js": "^3",
|
||||
"hoist-non-react-statics": "^3.3.2",
|
||||
"i18next-fs-backend": "^2.3.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"i18next": ">= 23.7.13",
|
||||
"next": ">= 12.0.0",
|
||||
"react": ">= 17.0.2",
|
||||
"react-i18next": ">= 13.5.0"
|
||||
}
|
||||
},
|
||||
"node_modules/next/node_modules/postcss": {
|
||||
"version": "8.4.31",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
|
||||
@@ -4217,6 +4454,28 @@
|
||||
"react": "^18.3.1"
|
||||
}
|
||||
},
|
||||
"node_modules/react-i18next": {
|
||||
"version": "15.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.0.2.tgz",
|
||||
"integrity": "sha512-z0W3/RES9Idv3MmJUcf0mDNeeMOUXe+xoL0kPfQPbDoZHmni/XsIoq5zgT2MCFUiau283GuBUK578uD/mkAbLQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.25.0",
|
||||
"html-parse-stringify": "^3.0.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"i18next": ">= 23.2.3",
|
||||
"react": ">= 16.8.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
},
|
||||
"react-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-is": {
|
||||
"version": "16.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
|
||||
@@ -4295,6 +4554,12 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/regenerator-runtime": {
|
||||
"version": "0.14.1",
|
||||
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
|
||||
"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/regexp.prototype.flags": {
|
||||
"version": "1.5.2",
|
||||
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
|
||||
@@ -4445,6 +4710,12 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/safe-identifier": {
|
||||
"version": "0.4.2",
|
||||
"resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
|
||||
"integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/safe-regex-test": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
|
||||
@@ -5194,6 +5465,15 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/void-elements": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
|
||||
"integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
|
||||
@@ -10,9 +10,14 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"glpk.js": "^4.0.2",
|
||||
"i18n": "^0.15.1",
|
||||
"i18next": "^23.15.2",
|
||||
"i18next-browser-languagedetector": "^8.0.0",
|
||||
"next": "14.2.11",
|
||||
"next-i18next": "^15.3.1",
|
||||
"react": "^18",
|
||||
"react-dom": "^18",
|
||||
"react-i18next": "^15.0.2",
|
||||
"react-popup": "^0.11.2",
|
||||
"reactjs-popup": "^2.0.6"
|
||||
},
|
||||
|
||||
+16
-2
@@ -3,8 +3,8 @@
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
--background: #ffffff;
|
||||
--foreground: #171717;
|
||||
--background: #171717;
|
||||
--foreground: #ffffff;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
@@ -158,3 +158,17 @@ 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} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
+78
-41
@@ -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.");
|
||||
customLog(getTranslation("err_nullInput") + "function isInputValidRegex.");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +75,7 @@ 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.");
|
||||
customLog(getTranslation("err_invalidInput") + " " + getTranslation("obj_box") + ".");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -67,55 +83,56 @@ function isInputValidRegex(obj: string | undefined, subj: string | undefined, bo
|
||||
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.");
|
||||
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');
|
||||
@@ -197,7 +214,11 @@ export function calculate_click() {
|
||||
// catch error: variables field has invalid characters
|
||||
if (!isInputValidRegex(objective, subject, bounds, variables)) return;
|
||||
|
||||
let wholeText: string = "Maximize\n obj: " + objective
|
||||
// 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
|
||||
@@ -205,41 +226,47 @@ export function calculate_click() {
|
||||
|
||||
// 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:");
|
||||
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);
|
||||
@@ -249,7 +276,8 @@ function run(text: string) {
|
||||
}
|
||||
|
||||
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 : '';
|
||||
@@ -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