Browse Source

grammatical fixes

Rolf Egert 5 years ago
parent
commit
3593e30baf
1 changed files with 15 additions and 15 deletions
  1. 15 15
      src/ui/controller/UpdateController.java

+ 15 - 15
src/ui/controller/UpdateController.java

@@ -333,12 +333,12 @@ public class UpdateController {
 				deleteRows(model.getMultiTable());
 				//short fix please make me new
 				DecoratedGroupNode dGroupNode = controller.getSimManager().getVisualRepresentationalState(model.getCurIteration()).getCreatedGroupNodes().get((CpsUpperNode) obj);
-				Object[] info = { "On this Canvas:", "" };
+				Object[] info = { "Statistics:", "" };
 				
-				Object[] numEle = { "Number of Canvas Objects", ((CpsUpperNode) obj).getNodes().size() };
-				Object[] numObj = { "Number of HolonObject", ((CpsUpperNode) obj).getNumHolonObj().size() };
-				Object[] numSwi = { "Number of HolonSwitch", ((CpsUpperNode) obj).getNumSwitches().size() };
-				Object[] numUpp = { "Number of UpperNodes", ((CpsUpperNode) obj).getNumUpperNodes().size() };
+				Object[] numEle = { "Number of Objects (total)", ((CpsUpperNode) obj).getNodes().size() };
+				Object[] numObj = { "Number of HolonObjects", ((CpsUpperNode) obj).getNumHolonObj().size() };
+				Object[] numSwi = { "Number of HolonSwitches", ((CpsUpperNode) obj).getNumSwitches().size() };
+				Object[] numUpp = { "Number of GroupNodes", ((CpsUpperNode) obj).getNumUpperNodes().size() };
 				model.getPropertyTable().addRow(info);
 				model.getPropertyTable().addRow(numEle);
 				model.getPropertyTable().addRow(numObj);
@@ -346,32 +346,32 @@ public class UpdateController {
 				model.getPropertyTable().addRow(numUpp);
 				if(dGroupNode != null) {
 					int numerator, denominator;
-					Object[] title = { "HolonObjectsInformations:", "" };
+					Object[] title = { "HolonObject Statistics:", "" };
 					
 					denominator	= dGroupNode.getAmountOfConsumer() + dGroupNode.getAmountOfSupplier() + dGroupNode.getAmountOfPassiv();
 					
 					numerator = dGroupNode.getAmountOfSupplier();
-					Object[] producer = { "Producer(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};					
+					Object[] producer = { "Producer:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};					
 					numerator = dGroupNode.getAmountOfConsumerWithState(HolonObjectState.NOT_SUPPLIED);
-					Object[] notSupplied = { "NotSupplied(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
+					Object[] notSupplied = { "UnSupplied:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					numerator = dGroupNode.getAmountOfConsumerWithState(HolonObjectState.PARTIALLY_SUPPLIED);
-					Object[] partiallySupplied = { "PartriallySupplied(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
+					Object[] partiallySupplied = { "PartriallySupplied:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					numerator = dGroupNode.getAmountOfConsumerWithState(HolonObjectState.SUPPLIED);
-					Object[] supplied = { "Supplied(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
+					Object[] supplied = { "Supplied:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					numerator = dGroupNode.getAmountOfConsumerWithState(HolonObjectState.OVER_SUPPLIED);
-					Object[] overSupplied = { "OverSupplied(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
+					Object[] overSupplied = { "OverSupplied:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					numerator = dGroupNode.getAmountOfPassiv();
 					Object[] passiv = { "Passiv(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					
 					Object[] nothing= {"", ""};
 					numerator = dGroupNode.getAmountOfAktiveElemntsFromHolonObjects();
 					denominator = dGroupNode.getAmountOfElemntsFromHolonObjects();
-					Object[] aktiv = { "AktivHolonElemnts(%):",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
+					Object[] aktiv = { "Active HolonElements:",  numerator + "/" + denominator + "("+ (float)numerator/(float)denominator * 100 + "%)"};
 					float consumption = dGroupNode.getConsumptionFromConsumer();
 					float production = dGroupNode.getProductionFromSupplier();
-					Object[] consumptionObj = { "Consumption:",  consumption};
-					Object[] productionObj = { "Production:",  production};
-					Object[] difference = { "Divrence:",  Math.abs(consumption - production)};
+					Object[] consumptionObj = { "Total Consumption:",  consumption};
+					Object[] productionObj = { "Total Production:",  production};
+					Object[] difference = { "Difference:",  Math.abs(consumption - production)};
 					
 					
 					model.getPropertyTable().addRow(title);