app v2.0

nutelabezgmo222 · Apr 29, 2021 · e99d601 · e99d601 · vercel · Apr 29, 2021
1 parent 4708664
commit e99d601
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 19 deletions.
diff --git a/src/App.js b/src/App.js
@@ -170,10 +170,8 @@ function App() {
     const simplex = new Simplex(prodObject, prodRestriction);
     setResult({
       variables: simplex.getResult(),
-      finalValue: simplex.getGoalValue(),
     });
   }
-
   return (
     <div className="app">
       <Header></Header>
@@ -203,8 +201,9 @@ function App() {
             Рохрахувати
           </button>
         </div>
-        {result && 
-          <Result resultSet={result} values={prodObject.values}/>
+        {
+          result &&
+          <Result resultSet={result} values={prodObject.values} attributes={prodObject.attributes}/>
         }
       </Main>
     </div>

diff --git a/src/components/Result.jsx b/src/components/Result.jsx
@@ -1,23 +1,54 @@
 import React from 'react'
 
-function Result({ resultSet = {}, values = [] }) {
+function Result({ resultSet = {}, values = [], attributes=[] }) {
+  const finalValue = resultSet.variables.reduce((total, variable) => {
+    if (variable.name < values.length) {
+      total += values[variable.name].prodValues[0].value * variable.value
+    }
+    return total;
+  }, 0)
+  const materials = attributes.reduce((arr, attr) => {
+    if (attr.id === 0) return arr;
+    const curBalance = resultSet.variables.reduce((total, variable) => {
+      if (variable.name < values.length) {
+        total +=
+          values[variable.name].prodValues.find((prodVal) => prodVal.id === attr.id).value *
+          variable.value
+      }
+      return total;
+    }, 0)
+    arr.push({ name: attr.title, balance: attr.restriction - curBalance });
+    return arr;
+  }, [])
   return (
     <div className="result">
       <h3>Результат</h3>
       <div className="result__body">
-        Для того щоб отримати максимальный прибуток у вигляді {Math.floor(resultSet.finalValue)} у.о
+        Для того щоб отримати максимальный прибуток у вигляді
+        <span style={{fontSize:'1.2em', color: 'darkgreen', fontWeight: 'bold'}}> {finalValue}</span> у.о
         <p>Необхідно створити:</p>
         <ul className="result__list">
           {
-            resultSet.variables &&
+            resultSet &&
             resultSet.variables.map((variable, i) => {
               if (typeof variable.name === 'number') {
-                return <li key={i}>{values[variable.name].title} : {Math.floor(variable.value)}</li>
+                if (variable.name < values.length) {
+                  return <li key={i}>{values[variable.name].title} : {variable.value}</li>
+                }
               }
               return '';
             })
           }
         </ul>
+        <p style={{marginTop: '15px'}}>Залишки матеріалів:</p>
+        <ul className="result__list">
+          {
+            materials &&
+            materials.map((material, i) => {
+              return <li key={`${material.name}_${i}`}>{material.name} : {material.balance}</li>
+            })
+          }
+        </ul>
       </div>
 
     </div>

diff --git a/src/features/simplex-core.js b/src/features/simplex-core.js
@@ -65,12 +65,14 @@ export default class Simplex extends SimplexData {
   leadingRowIndex = 0; // current decision leading row
   leadingElement = 0; // current leading element (crossing of leading col and row)
   lastCol = [];
-
+  itarationCount = 0;
   constructor(object, prodRest = null) {
     super(object, prodRest);
+    this.iterationCount = 0;
     this.initSimplexTable();
     while (!this.isFunctionOptimal()) {
       this.findOptimal();
+      this.iterationCount++;
     }
   }
 
@@ -134,7 +136,7 @@ export default class Simplex extends SimplexData {
   findLeadingRow() {
     let minIndex = 0;
     for (let i = 1; i < this.lastCol.length; i++) {
-      if (this.lastCol[minIndex] > this.lastCol[i]) {
+      if (this.lastCol[minIndex] > this.lastCol[i] || this.lastCol[minIndex] === null) {
         minIndex = i;
       }
     }
@@ -144,7 +146,7 @@ export default class Simplex extends SimplexData {
     this.lastCol = [];
     for (let i = 0; i < this.basisValues.length; i++) {
       let colValue;
-      if (this.coefMatrix[i][this.leadingColIndex] < 0) {
+      if (this.coefMatrix[i][this.leadingColIndex] <= 0) {
         colValue = null;
       } else {
         colValue =
@@ -221,16 +223,24 @@ export default class Simplex extends SimplexData {
     this.setLeadingElement();
   }
   getResult() {
-    return this.basisValues;
-  }
-  getGoalValue() {
-    return this.currentGoalValue;
+    const newBasisValues = this.basisValues.map((val) => {
+      let newValue = val.value.toFixed(3);
+      if (newValue.toString().slice(-3) === "999") {
+        newValue = Math.round(newValue);
+      } else {
+        newValue = Math.floor(newValue);
+      }
+      return {
+        ...val,
+        value: newValue,
+      };
+    });
+    return newBasisValues;
   }
   toString() {
-    console.log('basis: ', this.basisValues);
-    console.log('Matrix: ', this.coefMatrix);
-    console.log('goalValue: ', this.currentGoalValue);
-    console.log('indexRow: ', this.indexRow)
+    console.log(this.lastCol);
+    console.log("indexRow:", this.indexRow);
+    console.log("leadingElement:", this.leadingElement);
   }
 
 }