Topologie Algorithm in working condition

src/algorithm/topologie/GaAlgorithm.java

@@ -54,7 +54,7 @@ public class GaAlgorithm extends TopologieAlgorithmFramework {
 		best.fitness = evaluatePosition(best.position);
 		List<Double> runList = new ArrayList<Double>();
 		runList.add(best.fitness);
-		console.println("Bit-Array_length: " + best.position.size());
+		console.println("Integer_Array_length: " + best.position.size());
 		List<Individual> population = initPopuluationRandom(problemSize, best);
 		for(int generation = 0; generation< maxGenerations; generation++) {
 			if(moreInformation)console.println("Generation" + generation + " start with Fitness: " + best.fitness);

src/api/TopologieAlgorithmFramework.java

@@ -677,10 +677,6 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 	protected List<Integer> extractPositionAndAccess() {
 		Model model = control.getModel();
 		
-		
-		
-		
-		
 		//-->reset
 		accessWildcards.clear();
 		this.countForAccessMap = 0;
@@ -690,6 +686,11 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 		cableSet.clear();
 		cableList.clear();
 		accessGroupNode.clear();
+		accessIntegerToWildcard.clear();
+		addedIndexCable.clear();
+		switchList.clear();
+		accessSwitchGroupNode.clear();
+		edgeList.clear();
 		//<---
 		Category category = control.searchCategory("Wildcards");
 		if(category != null) {
@@ -993,7 +994,7 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 		}
 		//wildcards
 		else {
-			maximumIndex =  accessWildcards.size();
+			maximumIndex =  this.accessIntegerToWildcard.size();
 		}
 		return maximumIndex;
 	}

src/ui/controller/CanvasController.java

@@ -134,9 +134,6 @@ public class CanvasController {
 	 *            AbstractCpsObject
 	 */
 	public void deleteObjectOnCanvas(AbstractCanvasObject obj) {
-		 if (obj instanceof GroupNode) {
-	        	this.bfsNodeCleaner((GroupNode) obj);        	
-	    }
 		removeAllConnectionsFromObject(obj);
 		mpC.decIdx(obj.getId(), model.getCvsObjIdx());
 		model.getCvsObjIdx().remove(obj.getId());
@@ -215,11 +212,9 @@ public class CanvasController {
 		}
 
 		ArrayList<AbstractCanvasObject> tempList = new ArrayList<>();
-		System.out.println("okay copy");
 		// Objects
 		for (AbstractCanvasObject cps : model.getClipboradObjects()) {
 			if (cps instanceof HolonObject) {
-				System.out.println("copy");
 				tCps = new HolonObject((HolonObject) cps);
 			} else if (cps instanceof HolonSwitch) {
 				tCps = new HolonSwitch((HolonSwitch) cps);

src/ui/controller/Control.java

@@ -777,7 +777,7 @@ public class Control {
         }
     }
 
-    public void delUpperNode(GroupNode node, GroupNode upperNode) {
+    public void ungroupGroupNode(GroupNode node, GroupNode upperNode) {
         nodeController.undoUpperNode(node, upperNode);
         try {
             autoSave();
@@ -796,7 +796,6 @@ public class Control {
     }
 
     public void delObjUpperNode(AbstractCanvasObject object, GroupNode upperNode) {
-        System.out.println("delObjUpperNode");
     	nodeController.deleteObjectInUpperNode(object, upperNode);
         if (object instanceof GroupNode)
             canvasController.bfsNodeCleaner((GroupNode) object);

src/ui/controller/NodeController.java

@@ -268,23 +268,10 @@ class NodeController {
 	 * Delete a AbstactCpsObject from CPSUpperNode
 	 */
     void deleteObjectInUpperNode(AbstractCanvasObject object, GroupNode upperNode) {
-        Edge e = null;
-        System.out.println("Deleeeete Object in deleteObjectInUpperNode");
-		for (AbstractCanvasObject cps : upperNode.getNodes()) {
-			for (Edge p : cps.getConnections()) {
-				if (p.getA() == object || p.getB() == object) {
-					e = p;
-				}
-			}
-			if (!model.getClipboradObjects().contains(cps) && !(cps instanceof GroupNode)) {
-				cps.getConnectedTo().remove(e);
-			}
-		}
 		LinkedList<Edge> edgesToDelete = new LinkedList<Edge>();
 		for (Edge p : model.getEdgesOnCanvas()) {
 			if(p.isConnectedTo(object)) {
 				edgesToDelete.add(p);
-				System.out.println("Remove Edge!");
 			}
 		}
 		model.getEdgesOnCanvas().removeAll(edgesToDelete);				

src/ui/view/GroupNodeCanvas.java

@@ -169,7 +169,7 @@ public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, Mo
 
             savePos = new ArrayList<>();
             animCps = ((GroupNode) tempCps).getNodes();
-            controller.delUpperNode((GroupNode) tempCps, upperNode);
+            controller.ungroupGroupNode((GroupNode) tempCps, upperNode);
 
             for (int i = 0; i < animCps.size(); i++) {
                 savePos.add(new Position(0, 0));

src/ui/view/MyCanvas.java

@@ -155,7 +155,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 
 					savePos = new ArrayList<>();
 					animCps = ((GroupNode) tempCps).getNodes();
-					controller.delUpperNode((GroupNode) tempCps, null);
+					controller.ungroupGroupNode((GroupNode) tempCps, null);
 
 					for (int i = 0; i < animCps.size(); i++) {
 						savePos.add(new Position(0, 0));
@@ -263,8 +263,6 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 					controller.removeTrackingObj(cps);
 					// Remove UpperNodeTab if UpperNode deleted
 				if (cps instanceof GroupNode) {
-					System.out.println(getParent().getParent()
-							.getParent().getParent());
 					JTabbedPane tabbedPane = (JTabbedPane)getParent().getParent()
 							.getParent().getParent();
 					// Look if the uppernode is open in a Tab