Edgardo Palza 7 年 前
コミット
86f4bd101e
3 ファイル変更9 行追加5 行削除
  1. 5 5
      src/classes/HolonObject.java
  2. 1 0
      src/ui/view/GUI.java
  3. 3 0
      src/ui/view/MyCanvas.java

+ 5 - 5
src/classes/HolonObject.java

@@ -402,16 +402,16 @@ public class HolonObject extends AbstractCpsObject {
 		float tempFlex = 0;
 		for (HolonElement e : getElements()) {
 			if (e.getActiveFlex()) {
-				tempFlex += e.getFlexibility();
+				tempFlex += e.getFlexibility() * e.getAmount();
 			}
 		}
 		this.totalFlex = tempFlex;
 	}
-	
+
 	/**
 	 * calculates total flexible Production
 	 */
-	public float getFlexProd(){
+	public float getFlexProd() {
 		float tempFlex = 0;
 		for (HolonElement e : getElements()) {
 			if (e.getFlexibility() > 0) {
@@ -420,11 +420,11 @@ public class HolonObject extends AbstractCpsObject {
 		}
 		return tempFlex;
 	}
-	
+
 	/**
 	 * calculates total flexible Concumption
 	 */
-	public float getFlexCons(){
+	public float getFlexCons() {
 		float tempFlex = 0;
 		for (HolonElement e : getElements()) {
 			if (e.getFlexibility() < 0) {

+ 1 - 0
src/ui/view/GUI.java

@@ -1555,6 +1555,7 @@ public class GUI<E> implements CategoryListener {
 				} else if (model.getSelectedCpsObjects().size() == 1) {
 					model.getTableHolonElement().setModel(model.getSingleTable());
 				}
+
 			}
 		});
 

+ 3 - 0
src/ui/view/MyCanvas.java

@@ -818,6 +818,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 		controller.calculateStateForTimeStep(model.getCurIteration());
 
+		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
+		updCon.refreshTableProperties(model.getPropertyTable());
+
 		repaint();
 
 	}