Parcourir la source

minor edits... no logical changes

Rolf Egert il y a 5 ans
Parent
commit
3b90c8b44f

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
plott _backup.txt


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
plott.txt


+ 4 - 4
src/connection/ConnectHandheld.java → src/Connection/ConnectHandheld.java

@@ -1,4 +1,4 @@
-package connection;
+package Connection;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -26,9 +26,9 @@ import api.Algorithm;
 import classes.AbstractCpsObject;
 import classes.CpsUpperNode;
 import classes.HolonObject;
-import connection.ConnectPhysical.HolonObjectStatus;
-import connection.ConnectPhysical.PhysicalLinkWrapper;
-import connection.socket.Server;
+import Connection.ConnectPhysical.HolonObjectStatus;
+import Connection.ConnectPhysical.PhysicalLinkWrapper;
+import Connection.socket.Server;
 import ui.controller.Control;
 import ui.view.Console;
 

+ 1 - 1
src/connection/ConnectPhysical.java → src/Connection/ConnectPhysical.java

@@ -1,4 +1,4 @@
-package connection;
+package Connection;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;

+ 1 - 1
src/connection/socket/Server.java → src/Connection/socket/Server.java

@@ -1,4 +1,4 @@
-package connection.socket;
+package Connection.socket;
 import java.net.*;
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
src/exampleAlgorithms/FlexExample.java

@@ -400,7 +400,7 @@ public class FlexExample implements Algorithm {
 						continue;
 					}
 				}
-				result.activatedFlex += 	amountflexActivated++;
+				result.activatedFlex += 	amountflexActivated;
 				
 				println("Activated FlexThisTimeStep: "+ amountflexActivated+"   CostForThisTimeStep:" + costForThisTimeStep);
 				result.totalCost += costForThisTimeStep;
@@ -597,7 +597,7 @@ public class FlexExample implements Algorithm {
 		private class RunResult {
 			public int activatedFlex = 0;
 			public int deactivatedElements = 0;
-			public int totalCost = 0;
+			public float totalCost = 0;
 			public LinkedList<TimeStepStateResult> timeStepList = new LinkedList<TimeStepStateResult>();
 			
 			

BIN
src/exampleNetworks/_solved_variable_hugeassgrid_new.holon


BIN
src/exampleNetworks/holonsplitSP.holon


BIN
src/exampleNetworks/hugeassgrid.holon


BIN
src/exampleNetworks/hugeassgridsolved.holon


BIN
src/exampleNetworks/inhomogen_grid.holon


BIN
src/exampleNetworks/test.holon


BIN
src/exampleNetworks/testbig.holon


BIN
src/exampleNetworks/testholonsplit-grp.holon


BIN
src/exampleNetworks/testholonsplit.holon


BIN
src/exampleNetworks/variable_hugeassgrid.holon


BIN
src/exampleNetworks/variable_hugeassgrid_new.holon


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff