fixes #73 (id of holon element is now only incremented once) + some code optimization by IntelliJ

src/classes/HolonElement.java

@@ -1,357 +1,355 @@
 package classes;
 
-import java.awt.Point;
-import java.util.LinkedList;
-
 import com.google.gson.annotations.Expose;
 
+import java.awt.*;
+import java.util.LinkedList;
+
 /**
  * The class "HolonElement" represents any possible element that can be added to
  * a CpsObject (such as TV (consumer) or any energy source/producer).
- * 
- * @author Gruppe14
  *
+ * @author Gruppe14
  */
 public class HolonElement {
 
-	/* Name of the gadget */
-	@Expose
-	private String eleName;
-	/* Quantity */
-	@Expose
-	private int amount;
-	/* Energy per gadget */
-	@Expose
-	private float energy;
-	/* If the gadget is working xor not (true xor false) */
-	@Expose
-	private boolean active;
-	/* Total Energy */
-	@Expose
-	private float totalEnergy;
-	/* +: for Consumers and -: Producers */
-	@Expose
-	private char sign;
-	/* Place where the Object is Stored */
-	@Expose
-	private Pair<String, String> saving;
-	/*
-	 * ID
-	 */
-	@Expose
-	private int id;
-	/*
-	 * Flexibility
-	 */
-	@Expose
-	private float flexibility;
-	/*
-	 * Active the flexibility field
-	 */
-	@Expose
-	private boolean activeFlex;
-	/*
-	 * Energy at each point of the graph with 100 predefined points. At the
-	 * beginning, it starts with all values at energy
-	 */
-	private float[] energyAt;
-
-	// Points on the UnitGraph
-	LinkedList<Point> graphPoints;
-
-	/**
-	 * Create a new HolonElement with a user-defined name, amount of the same
-	 * element and energy per element.
-	 * 
-	 * @param eleName
-	 *            String
-	 * @param amount
-	 *            int
-	 * @param energy
-	 *            float
-	 */
-	public HolonElement(String eleName, int amount, float energy) {
-		setEleName(eleName);
-		setAmount(amount);
-		setEnergy(energy);
-		setActive(true);
-		setSign(energy);
-		setEnergyAt(energy);
-		setGraphPoints(new LinkedList<Point>());
-		setId(IdCounterElem.nextId());
-		setFlexibility(0);
-		setActiveFlex(false);
-	}
-
-	/**
-	 * Create a copy of the HolonElement given each one a new ID.
-	 * 
-	 * @param element
-	 *            element to copy
-	 */
-	public HolonElement(HolonElement element) {
-		setEleName(element.getEleName());
-		setAmount(element.getAmount());
-		setEnergy(element.getEnergy());
-		setActive(element.getActive());
-		setSign(element.getEnergy());
-		setEnergyAt(element.getEnergy());
-		for (int i = 0; i < energyAt.length; i++) {
-			energyAt[i] = element.getEnergyAt()[i];
-		}
-		setGraphPoints(new LinkedList<Point>());
-		for (Point p : element.getGraphPoints()) {
-			this.graphPoints.add(new Point((int) p.getX(), (int) p.getY()));
-		}
-		setSaving(null);
-		setId(IdCounterElem.nextId());
-		setFlexibility(0);
-		setActiveFlex(false);
-	}
-
-	/**
-	 * Get the Array of energy (100 values).
-	 * 
-	 * @return energyAt Array of Floats
-	 */
-	public float[] getEnergyAt() {
-		return energyAt;
-	}
-
-	/**
-	 * Set energy to any value to the whole array.
-	 * 
-	 * @param energy
-	 *            the value
-	 */
-	public void setEnergyAt(float energy) {
-		this.energyAt = new float[100];
-		for (int i = 0; i < energyAt.length; i++) {
-			this.energyAt[i] = energy;
-		}
-	}
-
-	/**
-	 * Set energy to any value at a given position.
-	 * 
-	 * @param pos
-	 *            int
-	 * @param energy
-	 *            float
-	 */
-	public void setEnergyAt(int pos, float energy) {
-		this.energyAt[pos] = energy;
-	}
-
-	/**
-	 * Get the user-defined Name.
-	 * 
-	 * @return the name String
-	 */
-	public String getEleName() {
-		return eleName;
-	}
-
-	/**
-	 * Set the name to any new name.
-	 * 
-	 * @param name
-	 *            the name to set
-	 */
-	public void setEleName(String name) {
-		this.eleName = name;
-	}
-
-	/**
-	 * Get the actual amount of Elements in the selected Object.
-	 * 
-	 * @return the amount int
-	 */
-	public int getAmount() {
-		return amount;
-	}
-
-	/**
-	 * Set the amount of the Element in the selected Object.
-	 * 
-	 * @param amount
-	 *            the amount to set
-	 */
-	public void setAmount(int amount) {
-		this.amount = amount;
-	}
-
-	/**
-	 * Get the energy value of the selected Element.
-	 * 
-	 * @return the energy
-	 */
-	public float getEnergy() {
-		return energy;
-	}
-
-	/**
-	 * Set the energy value of the selected Element.
-	 * 
-	 * @param energy
-	 *            the energy to set
-	 */
-	public void setEnergy(float energy) {
-		this.energy = energy;
-	}
-
-	/**
-	 * Get the Status of the Element (see description of variables).
-	 * 
-	 * @return the active
-	 */
-	public boolean getActive() {
-		return active;
-	}
-
-	/**
-	 * Set the Status of the Element (see description of variables).
-	 * 
-	 * @param active
-	 *            the active to set
-	 */
-	public void setActive(boolean active) {
-		this.active = active;
-	}
-
-	/**
-	 * Multiply the amount of gadgets, given by the user, and the
-	 * consumption/production. If the switch isWorking is turned off for on
-	 * gadget, the energy of this gadget have to be subtracted.
-	 * 
-	 * @return totalEnergy (actual)
-	 */
-	public float getTotalEnergy() {
-		if (activeFlex) {
-			totalEnergy = ((float) amount) * (energy + flexibility);
-		} else {
-			totalEnergy = ((float) amount) * energy;
-		}
-		return totalEnergy;
-	}
-
-	/**
-	 * Get the energy value at a selected time x.
-	 * 
-	 * @param x
-	 *            int
-	 * @return energy value
-	 */
-	public float getTotalEnergyAtTimeStep(int x) {
-		float result = 0;
-		if (activeFlex) {
-			result = ((float) amount) * (energyAt[x] + flexibility);
-		} else {
-			result = ((float) amount) * energyAt[x];
-		}
-		return result;
-	}
-
-	/**
-	 * Get the symbol of the value (see variable description).
-	 * 
-	 * @return the sign
-	 */
-	public char getSign() {
-		return sign;
-	}
-
-	/**
-	 * Set symbol of the value.
-	 * 
-	 * @param energy
-	 *            the sign to set
-	 */
-	public void setSign(float energy) {
-		if (energy < 0)
-			this.sign = '-';
-		else
-			this.sign = '+';
-	}
-
-	/**
-	 * Get the points (values) in the graph.
-	 * 
-	 * @return the Graph Points
-	 */
-	public LinkedList<Point> getGraphPoints() {
-		return graphPoints;
-	}
-
-	/**
-	 * Set the points (values) in the graph.
-	 * 
-	 * @param points
-	 *            the Graph points
-	 */
-	public void setGraphPoints(LinkedList<Point> points) {
-		this.graphPoints = points;
-	}
-
-	/**
-	 * Set the flexibility of an element
-	 */
-	public void setFlexibility(float f) {
-		this.flexibility = f;
-	}
-
-	/**
-	 * Get the flexibility of an element
-	 */
-	public float getFlexibility() {
-		return this.flexibility;
-	}
-
-	/**
-	 * Set the flexibility of an element
-	 */
-	public void setActiveFlex(boolean b) {
-		this.activeFlex = b;
-	}
-
-	/**
-	 * Get the flexibility of an element
-	 */
-	public boolean getActiveFlex() {
-		return this.activeFlex;
-	}
-
-	/**
-	 * Set the ID of the HolonElement (one time only).
-	 * 
-	 * @param id
-	 *            the id
-	 */
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	/**
-	 * Get the Id of the selected HolonElement.
-	 * 
-	 * @return id the id
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * @return the saving
-	 */
-	public Pair<String, String> getSaving() {
-		return saving;
-	}
-
-	/**
-	 * @param saving
-	 *            the saving to set
-	 */
-	public void setSaving(Pair<String, String> saving) {
-		this.saving = saving;
-	}
+    // Points on the UnitGraph
+    LinkedList<Point> graphPoints;
+    /* Name of the gadget */
+    @Expose
+    private String eleName;
+    /* Quantity */
+    @Expose
+    private int amount;
+    /* Energy per gadget */
+    @Expose
+    private float energy;
+    /* If the gadget is working xor not (true xor false) */
+    @Expose
+    private boolean active;
+    /* Total Energy */
+    @Expose
+    private float totalEnergy;
+    /* +: for Consumers and -: Producers */
+    @Expose
+    private char sign;
+    /* Place where the Object is Stored */
+    @Expose
+    private Pair<String, String> saving;
+    /*
+     * ID
+     */
+    @Expose
+    private int id;
+    /*
+     * Flexibility
+     */
+    @Expose
+    private float flexibility;
+    /*
+     * Active the flexibility field
+     */
+    @Expose
+    private boolean activeFlex;
+    /*
+     * Energy at each point of the graph with 100 predefined points. At the
+     * beginning, it starts with all values at energy
+     */
+    private float[] energyAt;
+
+    /**
+     * Create a new HolonElement with a user-defined name, amount of the same
+     * element and energy per element.
+     *
+     * @param eleName String
+     * @param amount  int
+     * @param energy  float
+     */
+    public HolonElement(String eleName, int amount, float energy) {
+        setEleName(eleName);
+        setAmount(amount);
+        setEnergy(energy);
+        setActive(true);
+        setSign(energy);
+        setEnergyAt(energy);
+        setGraphPoints(new LinkedList<>());
+        setId(IdCounterElem.nextId());
+        setFlexibility(0);
+        setActiveFlex(false);
+    }
+
+    /**
+     * same as standard constructor, but with already given id (so the counter is not increased twice)
+     */
+    public HolonElement(String eleName, int amount, float energy, int id) {
+        setEleName(eleName);
+        setAmount(amount);
+        setEnergy(energy);
+        setActive(true);
+        setSign(energy);
+        setEnergyAt(energy);
+        setGraphPoints(new LinkedList<>());
+        setId(id);
+        setFlexibility(0);
+        setActiveFlex(false);
+    }
+
+    /**
+     * Create a copy of the HolonElement given each one a new ID.
+     *
+     * @param element element to copy
+     */
+    public HolonElement(HolonElement element) {
+        setEleName(element.getEleName());
+        setAmount(element.getAmount());
+        setEnergy(element.getEnergy());
+        setActive(element.getActive());
+        setSign(element.getEnergy());
+        setEnergyAt(element.getEnergy());
+        for (int i = 0; i < energyAt.length; i++) {
+            energyAt[i] = element.getEnergyAt()[i];
+        }
+        setGraphPoints(new LinkedList<>());
+        for (Point p : element.getGraphPoints()) {
+            this.graphPoints.add(new Point((int) p.getX(), (int) p.getY()));
+        }
+        setSaving(null);
+        setId(IdCounterElem.nextId());
+        setFlexibility(0);
+        setActiveFlex(false);
+    }
+
+    /**
+     * Get the Array of energy (100 values).
+     *
+     * @return energyAt Array of Floats
+     */
+    public float[] getEnergyAt() {
+        return energyAt;
+    }
+
+    /**
+     * Set energy to any value to the whole array.
+     *
+     * @param energy the value
+     */
+    public void setEnergyAt(float energy) {
+        this.energyAt = new float[100];
+        for (int i = 0; i < energyAt.length; i++) {
+            this.energyAt[i] = energy;
+        }
+    }
+
+    /**
+     * Set energy to any value at a given position.
+     *
+     * @param pos    int
+     * @param energy float
+     */
+    public void setEnergyAt(int pos, float energy) {
+        this.energyAt[pos] = energy;
+    }
+
+    /**
+     * Get the user-defined Name.
+     *
+     * @return the name String
+     */
+    public String getEleName() {
+        return eleName;
+    }
+
+    /**
+     * Set the name to any new name.
+     *
+     * @param name the name to set
+     */
+    public void setEleName(String name) {
+        this.eleName = name;
+    }
+
+    /**
+     * Get the actual amount of Elements in the selected Object.
+     *
+     * @return the amount int
+     */
+    public int getAmount() {
+        return amount;
+    }
+
+    /**
+     * Set the amount of the Element in the selected Object.
+     *
+     * @param amount the amount to set
+     */
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * Get the energy value of the selected Element.
+     *
+     * @return the energy
+     */
+    public float getEnergy() {
+        return energy;
+    }
+
+    /**
+     * Set the energy value of the selected Element.
+     *
+     * @param energy the energy to set
+     */
+    public void setEnergy(float energy) {
+        this.energy = energy;
+    }
+
+    /**
+     * Get the Status of the Element (see description of variables).
+     *
+     * @return the active
+     */
+    public boolean getActive() {
+        return active;
+    }
+
+    /**
+     * Set the Status of the Element (see description of variables).
+     *
+     * @param active the active to set
+     */
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    /**
+     * Multiply the amount of gadgets, given by the user, and the
+     * consumption/production. If the switch isWorking is turned off for on
+     * gadget, the energy of this gadget have to be subtracted.
+     *
+     * @return totalEnergy (actual)
+     */
+    public float getTotalEnergy() {
+        if (activeFlex) {
+            totalEnergy = ((float) amount) * (energy + flexibility);
+        } else {
+            totalEnergy = ((float) amount) * energy;
+        }
+        return totalEnergy;
+    }
+
+    /**
+     * Get the energy value at a selected time x.
+     *
+     * @param x int
+     * @return energy value
+     */
+    public float getTotalEnergyAtTimeStep(int x) {
+        float result;
+        if (activeFlex) {
+            result = ((float) amount) * (energyAt[x] + flexibility);
+        } else {
+            result = ((float) amount) * energyAt[x];
+        }
+        return result;
+    }
+
+    /**
+     * Get the symbol of the value (see variable description).
+     *
+     * @return the sign
+     */
+    public char getSign() {
+        return sign;
+    }
+
+    /**
+     * Set symbol of the value.
+     *
+     * @param energy the sign to set
+     */
+    public void setSign(float energy) {
+        if (energy < 0)
+            this.sign = '-';
+        else
+            this.sign = '+';
+    }
+
+    /**
+     * Get the points (values) in the graph.
+     *
+     * @return the Graph Points
+     */
+    public LinkedList<Point> getGraphPoints() {
+        return graphPoints;
+    }
+
+    /**
+     * Set the points (values) in the graph.
+     *
+     * @param points the Graph points
+     */
+    public void setGraphPoints(LinkedList<Point> points) {
+        this.graphPoints = points;
+    }
+
+    /**
+     * Get the flexibility of an element
+     */
+    public float getFlexibility() {
+        return this.flexibility;
+    }
+
+    /**
+     * Set the flexibility of an element
+     */
+    public void setFlexibility(float f) {
+        this.flexibility = f;
+    }
+
+    /**
+     * Get the flexibility of an element
+     */
+    public boolean getActiveFlex() {
+        return this.activeFlex;
+    }
+
+    /**
+     * Set the flexibility of an element
+     */
+    public void setActiveFlex(boolean b) {
+        this.activeFlex = b;
+    }
+
+    /**
+     * Get the Id of the selected HolonElement.
+     *
+     * @return id the id
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Set the ID of the HolonElement (one time only).
+     *
+     * @param id the id
+     */
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the saving
+     */
+    public Pair<String, String> getSaving() {
+        return saving;
+    }
+
+    /**
+     * @param saving the saving to set
+     */
+    public void setSaving(Pair<String, String> saving) {
+        this.saving = saving;
+    }
 }

src/classes/HolonObject.java

@@ -1,441 +1,424 @@
 package classes;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.google.gson.annotations.Expose;
 
-import ui.controller.MultiPurposeController;
+import java.awt.*;
+import java.util.ArrayList;
 
 /**
  * The class HolonObject represents any Object on the system which capability of
  * injecting or consuming energy on the network, for instance a house or a power
  * plant.
- * 
- * @author Gruppe14
  *
+ * @author Gruppe14
  */
 public class HolonObject extends AbstractCpsObject {
-	/*
-	 * Color of the actual state (red = no supplied, yellow = partially supplied
-	 * and green = supplied)
-	 */
-	@Expose
-	private Color stateColor;
-	/* Array of all consumers */
-	private ArrayList<HolonElement> elements;
-	/* Total of consumption */
-	@Expose
-	private float currentEnergy;
-	/* Array for tracking Production */
-	private float[] trackingProd;
-	/* Array for tracking Consumption */
-	private float[] trackingCons;
-	/* Total Flexibility */
-	private float totalFlex;
-	/*
-	 * 0 = no energy, 1 = not supplied, 2 = supplied, 3 producer, 4 Partially
-	 * Supplied
-	 */
-	public final static int NO_ENERGY = 0;
-	public final static int NOT_SUPPLIED = 1;
-	public final static int SUPPLIED = 2;
-	public final static int PRODUCER = 3;
-	public final static int PARTIALLY_SUPPLIED = 4;
-
-	@Expose
-	private int state = 0;
-
-	/**
-	 * Constructor Set by default the name of the object equals to the category
-	 * name, until the user changes it.
-	 * 
-	 * @param objName
-	 *            name of the Object
-	 */
-	public HolonObject(String objName) {
-		super(objName);
-		setElements(new ArrayList<HolonElement>());
-		setState();
-		setTrackingProd(new float[100]);
-		setTrackingCons(new float[100]);
-	}
-
-	/**
-	 * Contructor of a copy of an Object.
-	 * 
-	 * @param obj
-	 *            object to be copied
-	 */
-	public HolonObject(AbstractCpsObject obj) {
-		super(obj);
-		setElements(copyElements(((HolonObject) obj).getElements()));
-		setState();
-		setTrackingProd(new float[100]);
-		setTrackingCons(new float[100]);
-	}
-
-	/**
-	 * sets the State, wether object is a producer, zero Energy, supplied or
-	 * not.
-	 */
-	public void setState() {
-		if (getCurrentEnergy() > 0) {
-			setState(3);
-			stateColor = Color.lightGray;
-		} else {
-			if (getCurrentEnergy() == 0) {
-				setState(0);
-				stateColor = Color.WHITE;
-			} else {
-				if (checkIfPartiallySupplied(0)) {
-					stateColor = Color.yellow;
-				} else {
-					stateColor = new Color(230, 120, 100);
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * Getter for all Elements in the HolonObject.
-	 * 
-	 * @return the elements ArrayList
-	 */
-	public ArrayList<HolonElement> getElements() {
-		return elements;
-	}
-
-	/**
-	 * Set a new ArrayList with HolonElements into the HolonObject.
-	 * 
-	 * @param elements
-	 *            the elements to set
-	 */
-	public void setElements(ArrayList<HolonElement> elements) {
-		this.elements = elements;
-	}
-
-	/**
-	 * adds an Element to the Object.
-	 * 
-	 * @param element
-	 *            the Element to add
-	 */
-	public void addElements(HolonElement element) {
-		elements.add(element);
-	}
-
-	/**
-	 * Doesn't take into account which timestep is watched, calculates the max
-	 * values.
-	 * 
-	 * @return the currentEnergy
-	 */
-	public float getCurrentEnergy() {
-		float temp = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getActive()) {
-				temp = temp + e.getTotalEnergy();
-			}
-		}
-		currentEnergy = temp;
-		return currentEnergy;
-	}
-
-	/**
-	 * Getter for the current energy at a given timestep.
-	 * 
-	 * @param x
-	 *            timestep
-	 * @return corresponding energy
-	 */
-	public float getCurrentEnergyAtTimeStep(int x) {
-		float temp = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getActive()) {
-				temp = temp + e.getTotalEnergyAtTimeStep(x);
-			}
-		}
-		currentEnergy = temp;
-		return currentEnergy;
-	}
-
-	/**
-	 * deletes Element at a given index.
-	 * 
-	 * @param idx
-	 *            index
-	 */
-	public void deleteElement(int idx) {
-		elements.remove(idx);
-	}
-
-	/**
-	 * String of all consumers in this HolonObject.
-	 * 
-	 * @return all the names of this HolonObject separated by "," each object
-	 */
-	public String toStringElements() {
-		String objString = "Empty";
-		for (HolonElement e : elements) {
-			if (objString == "Empty") {
-				objString = e.getEleName();
-			} else {
-				objString = objString + ", " + e.getEleName();
-			}
-		}
-		return objString;
-	}
-
-
-	/**
-	 * Copy all Elements into a New Array.
-	 * 
-	 * @param arr
-	 *            to copy
-	 * @return the copy of arr
-	 */
-	public ArrayList<HolonElement> copyElements(ArrayList<HolonElement> arr) {
-		ArrayList<HolonElement> newArr = new ArrayList<>();
-		for (HolonElement t : arr) {
-			newArr.add(new HolonElement(t));
-		}
-		return newArr;
-	}
-
-	/**
-	 * Get the state of the Object.
-	 * 
-	 * @return state the State of the Element
-	 */
-	public int getState() {
-		return this.state;
-	}
-
-	/**
-	 * Set the state of the Object.
-	 * 
-	 * @param state
-	 *            boolean if the Object is fully supplied
-	 */
-	public void setState(int state) {
-		this.state = state;
-		switch (state) {
-		case 0:
-			stateColor = Color.WHITE;
-			break;
-
-		case 1:
-			stateColor = new Color(230, 120, 100);
-			break;
-
-		case 2:
-			stateColor = Color.GREEN;
-			break;
-
-		case 3:
-			stateColor = Color.lightGray;
-			break;
-
-		case 4:
-			stateColor = Color.YELLOW;
-		}
-	}
-
-	/**
-	 * Search for the element with the name.
-	 * 
-	 * @param name
-	 *            name of the object to be searched
-	 * @return the searched HolonElement
-	 */
-	public HolonElement searchElement(String name) {
-		HolonElement ele = null;
-		for (HolonElement e : getElements()) {
-			if (e.getEleName().equals(name)) {
-				ele = e;
-			}
-		}
-		return ele;
-	}
-
-	/**
-	 * Search for the element with the id.
-	 * 
-	 * @param id
-	 *            id of the element to be founded
-	 * @return the element
-	 */
-	public HolonElement searchElementById(int id) {
-		HolonElement ele = null;
-		for (HolonElement e : getElements()) {
-			if (e.getId() == id) {
-				ele = e;
-			}
-		}
-		return ele;
-	}
-
-	/**
-	 * Check if Partially Supplied.
-	 * 
-	 * @param x
-	 *            current Iteration
-	 * @return boolean is partially supplied
-	 */
-	public boolean checkIfPartiallySupplied(int x) {
-		if (getElements().size() == 0) {
-			return false;
-		}
-		float minConsum = getElements().get(0).getTotalEnergyAtTimeStep(x);
-		float prod = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getActive()) {
-				if (e.getTotalEnergyAtTimeStep(x) > 0) {
-					prod = prod + e.getTotalEnergyAtTimeStep(x);
-				}
-				if (minConsum < 0 && (e.getTotalEnergyAtTimeStep(x) > minConsum && e.getTotalEnergyAtTimeStep(x) < 0)) {
-					minConsum = e.getTotalEnergyAtTimeStep(x);
-				} else if (minConsum >= 0 && e.getTotalEnergyAtTimeStep(x) < minConsum) {
-					minConsum = e.getTotalEnergyAtTimeStep(x);
-				}
-			}
-		}
-		// System.out.println("minCons: " + minConsum + " prod: " + prod);
-		if (minConsum < 0 && prod >= -minConsum) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Set the State Color.
-	 * 
-	 * @param color
-	 *            the Color
-	 */
-	public void setColor(Color color) {
-		stateColor = color;
-	}
-
-	/**
-	 * Get the Color.
-	 * 
-	 * @return stateColor the Color
-	 */
-	public Color getColor() {
-		return stateColor;
-	}
-
-	/**
-	 * Set the Array Production
-	 */
-	public void setTrackingProd(float[] arr) {
-		this.trackingProd = arr;
-	}
-
-	/**
-	 * Get the Array Production
-	 */
-	public float[] getTrackingProd() {
-		return this.trackingProd;
-	}
-
-	/**
-	 * Set the Array Consumption
-	 */
-	public void setTrackingCons(float[] arr) {
-		this.trackingCons = arr;
-	}
-
-	/**
-	 * Get the Array Consumption
-	 */
-	public float[] getTrackingCons() {
-		return this.trackingCons;
-	}
-
-	/**
-	 * Get the Array Consumption
-	 */
-	public float getTotalFlex() {
-		return totalFlex;
-	}
-
-	/**
-	 * Set the Array Consumption
-	 */
-	public void setTotalFlex(float totalFlex) {
-		this.totalFlex = totalFlex;
-	}
-
-	/**
-	 * Update the totalFlex
-	 */
-	public void updateTotalFlex() {
-		float tempFlex = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getActiveFlex()) {
-				tempFlex += e.getFlexibility() * e.getAmount();
-			}
-		}
-		this.totalFlex = tempFlex;
-	}
-
-	/**
-	 * calculates total flexible Production
-	 */
-	public float getFlexProd() {
-		float tempFlex = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getFlexibility() > 0) {
-				tempFlex += e.getFlexibility();
-			}
-		}
-		return tempFlex;
-	}
-
-	/**
-	 * calculates total flexible Concumption
-	 */
-	public float getFlexCons() {
-		float tempFlex = 0;
-		for (HolonElement e : getElements()) {
-			if (e.getFlexibility() < 0) {
-				tempFlex += e.getFlexibility();
-			}
-		}
-		return tempFlex;
-	}
-
-	/**
-	 * If the user track any HolonObject the tracking information will be
-	 * updated. (If the HolonObject enters into the untracked state, the array
-	 * will be reseted)
-	 */
-
-	public void updateTrackingInfo() {
-		float[] tempProd = new float[100];
-		float[] tempCons = new float[100];
-		for (int i = 0; i < 100; i++) {
-			float valueProd = 0;
-			float valueCons = 0;
-			for (HolonElement e : getElements()) {
-				if (e.getActive() && e.getSign() == '+') {
-					valueProd = valueProd + e.getTotalEnergyAtTimeStep(i);
-				}
-				if (e.getActive() && e.getSign() == '-') {
-					valueCons = valueCons + e.getTotalEnergyAtTimeStep(i);
-				}
-			}
-			tempProd[i] = valueProd;
-			tempCons[i] = valueCons;
-		}
-		this.trackingProd = tempProd;
-		this.trackingCons = tempCons;
-	}
+    /*
+     * 0 = no energy, 1 = not supplied, 2 = supplied, 3 producer, 4 Partially
+     * Supplied
+     */
+    public final static int NO_ENERGY = 0;
+    public final static int NOT_SUPPLIED = 1;
+    public final static int SUPPLIED = 2;
+    public final static int PRODUCER = 3;
+    public final static int PARTIALLY_SUPPLIED = 4;
+    /*
+     * Color of the actual state (red = no supplied, yellow = partially supplied
+     * and green = supplied)
+     */
+    @Expose
+    private Color stateColor;
+    /* Array of all consumers */
+    private ArrayList<HolonElement> elements;
+    /* Total of consumption */
+    @Expose
+    private float currentEnergy;
+    /* Array for tracking Production */
+    private float[] trackingProd;
+    /* Array for tracking Consumption */
+    private float[] trackingCons;
+    /* Total Flexibility */
+    private float totalFlex;
+    @Expose
+    private int state = 0;
+
+    /**
+     * Constructor Set by default the name of the object equals to the category
+     * name, until the user changes it.
+     *
+     * @param objName name of the Object
+     */
+    public HolonObject(String objName) {
+        super(objName);
+        setElements(new ArrayList<>());
+        setState();
+        setTrackingProd(new float[100]);
+        setTrackingCons(new float[100]);
+    }
+
+    /**
+     * Contructor of a copy of an Object.
+     *
+     * @param obj object to be copied
+     */
+    public HolonObject(AbstractCpsObject obj) {
+        super(obj);
+        setElements(copyElements(((HolonObject) obj).getElements()));
+        setState();
+        setTrackingProd(new float[100]);
+        setTrackingCons(new float[100]);
+    }
+
+    /**
+     * sets the State, wether object is a producer, zero Energy, supplied or
+     * not.
+     */
+    public void setState() {
+        if (getCurrentEnergy() > 0) {
+            setState(3);
+            stateColor = Color.lightGray;
+        } else {
+            if (getCurrentEnergy() == 0) {
+                setState(0);
+                stateColor = Color.WHITE;
+            } else {
+                if (checkIfPartiallySupplied(0)) {
+                    stateColor = Color.yellow;
+                } else {
+                    stateColor = new Color(230, 120, 100);
+                }
+
+            }
+        }
+    }
+
+    /**
+     * Getter for all Elements in the HolonObject.
+     *
+     * @return the elements ArrayList
+     */
+    public ArrayList<HolonElement> getElements() {
+        return elements;
+    }
+
+    /**
+     * Set a new ArrayList with HolonElements into the HolonObject.
+     *
+     * @param elements the elements to set
+     */
+    public void setElements(ArrayList<HolonElement> elements) {
+        this.elements = elements;
+    }
+
+    /**
+     * adds an Element to the Object.
+     *
+     * @param element the Element to add
+     */
+    public void addElement(HolonElement element) {
+        elements.add(element);
+    }
+
+    /**
+     * Doesn't take into account which timestep is watched, calculates the max
+     * values.
+     *
+     * @return the currentEnergy
+     */
+    public float getCurrentEnergy() {
+        float temp = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getActive()) {
+                temp = temp + e.getTotalEnergy();
+            }
+        }
+        currentEnergy = temp;
+        return currentEnergy;
+    }
+
+    /**
+     * Getter for the current energy at a given timestep.
+     *
+     * @param x timestep
+     * @return corresponding energy
+     */
+    public float getCurrentEnergyAtTimeStep(int x) {
+        float temp = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getActive()) {
+                temp = temp + e.getTotalEnergyAtTimeStep(x);
+            }
+        }
+        currentEnergy = temp;
+        return currentEnergy;
+    }
+
+    /**
+     * deletes Element at a given index.
+     *
+     * @param idx index
+     */
+    public void deleteElement(int idx) {
+        elements.remove(idx);
+    }
+
+    /**
+     * String of all consumers in this HolonObject.
+     *
+     * @return all the names of this HolonObject separated by "," each object
+     */
+    public String toStringElements() {
+        String objString = "Empty";
+        for (HolonElement e : elements) {
+            if (objString == "Empty") {
+                objString = e.getEleName();
+            } else {
+                objString = objString + ", " + e.getEleName();
+            }
+        }
+        return objString;
+    }
+
+
+    /**
+     * Copy all Elements into a New Array.
+     *
+     * @param arr to copy
+     * @return the copy of arr
+     */
+    public ArrayList<HolonElement> copyElements(ArrayList<HolonElement> arr) {
+        ArrayList<HolonElement> newArr = new ArrayList<>();
+        for (HolonElement t : arr) {
+            newArr.add(new HolonElement(t));
+        }
+        return newArr;
+    }
+
+    /**
+     * Get the state of the Object.
+     *
+     * @return state the State of the Element
+     */
+    public int getState() {
+        return this.state;
+    }
+
+    /**
+     * Set the state of the Object.
+     *
+     * @param state boolean if the Object is fully supplied
+     */
+    public void setState(int state) {
+        this.state = state;
+        switch (state) {
+            case 0:
+                stateColor = Color.WHITE;
+                break;
+
+            case 1:
+                stateColor = new Color(230, 120, 100);
+                break;
+
+            case 2:
+                stateColor = Color.GREEN;
+                break;
+
+            case 3:
+                stateColor = Color.lightGray;
+                break;
+
+            case 4:
+                stateColor = Color.YELLOW;
+        }
+    }
+
+    /**
+     * Search for the element with the name.
+     *
+     * @param name name of the object to be searched
+     * @return the searched HolonElement
+     */
+    public HolonElement searchElement(String name) {
+        HolonElement ele = null;
+        for (HolonElement e : getElements()) {
+            if (e.getEleName().equals(name)) {
+                ele = e;
+            }
+        }
+        return ele;
+    }
+
+    /**
+     * Search for the element with the id.
+     *
+     * @param id id of the element to be founded
+     * @return the element
+     */
+    public HolonElement searchElementById(int id) {
+        HolonElement ele = null;
+        for (HolonElement e : getElements()) {
+            if (e.getId() == id) {
+                ele = e;
+            }
+        }
+        return ele;
+    }
+
+    /**
+     * Check if Partially Supplied.
+     *
+     * @param x current Iteration
+     * @return boolean is partially supplied
+     */
+    public boolean checkIfPartiallySupplied(int x) {
+        if (getElements().size() == 0) {
+            return false;
+        }
+        float minConsum = getElements().get(0).getTotalEnergyAtTimeStep(x);
+        float prod = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getActive()) {
+                if (e.getTotalEnergyAtTimeStep(x) > 0) {
+                    prod = prod + e.getTotalEnergyAtTimeStep(x);
+                }
+                if (minConsum < 0 && (e.getTotalEnergyAtTimeStep(x) > minConsum && e.getTotalEnergyAtTimeStep(x) < 0)) {
+                    minConsum = e.getTotalEnergyAtTimeStep(x);
+                } else if (minConsum >= 0 && e.getTotalEnergyAtTimeStep(x) < minConsum) {
+                    minConsum = e.getTotalEnergyAtTimeStep(x);
+                }
+            }
+        }
+        // System.out.println("minCons: " + minConsum + " prod: " + prod);
+        if (minConsum < 0 && prod >= -minConsum) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Get the Color.
+     *
+     * @return stateColor the Color
+     */
+    public Color getColor() {
+        return stateColor;
+    }
+
+    /**
+     * Set the State Color.
+     *
+     * @param color the Color
+     */
+    public void setColor(Color color) {
+        stateColor = color;
+    }
+
+    /**
+     * Get the Array Production
+     */
+    public float[] getTrackingProd() {
+        return this.trackingProd;
+    }
+
+    /**
+     * Set the Array Production
+     */
+    public void setTrackingProd(float[] arr) {
+        this.trackingProd = arr;
+    }
+
+    /**
+     * Get the Array Consumption
+     */
+    public float[] getTrackingCons() {
+        return this.trackingCons;
+    }
+
+    /**
+     * Set the Array Consumption
+     */
+    public void setTrackingCons(float[] arr) {
+        this.trackingCons = arr;
+    }
+
+    /**
+     * Get the Array Consumption
+     */
+    public float getTotalFlex() {
+        return totalFlex;
+    }
+
+    /**
+     * Set the Array Consumption
+     */
+    public void setTotalFlex(float totalFlex) {
+        this.totalFlex = totalFlex;
+    }
+
+    /**
+     * Update the totalFlex
+     */
+    public void updateTotalFlex() {
+        float tempFlex = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getActiveFlex()) {
+                tempFlex += e.getFlexibility() * e.getAmount();
+            }
+        }
+        this.totalFlex = tempFlex;
+    }
+
+    /**
+     * calculates total flexible Production
+     */
+    public float getFlexProd() {
+        float tempFlex = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getFlexibility() > 0) {
+                tempFlex += e.getFlexibility();
+            }
+        }
+        return tempFlex;
+    }
+
+    /**
+     * calculates total flexible Concumption
+     */
+    public float getFlexCons() {
+        float tempFlex = 0;
+        for (HolonElement e : getElements()) {
+            if (e.getFlexibility() < 0) {
+                tempFlex += e.getFlexibility();
+            }
+        }
+        return tempFlex;
+    }
+
+    /**
+     * If the user track any HolonObject the tracking information will be
+     * updated. (If the HolonObject enters into the untracked state, the array
+     * will be reseted)
+     */
+
+    public void updateTrackingInfo() {
+        float[] tempProd = new float[100];
+        float[] tempCons = new float[100];
+        for (int i = 0; i < 100; i++) {
+            float valueProd = 0;
+            float valueCons = 0;
+            for (HolonElement e : getElements()) {
+                if (e.getActive() && e.getSign() == '+') {
+                    valueProd = valueProd + e.getTotalEnergyAtTimeStep(i);
+                }
+                if (e.getActive() && e.getSign() == '-') {
+                    valueCons = valueCons + e.getTotalEnergyAtTimeStep(i);
+                }
+            }
+            tempProd[i] = valueProd;
+            tempCons[i] = valueCons;
+        }
+        this.trackingProd = tempProd;
+        this.trackingCons = tempCons;
+    }
 }

src/tests/PraktikumHolonsTestClasses.java

@@ -1,12 +1,12 @@
 package tests;
 
 import classes.*;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
-import java.awt.Color;
+import java.awt.*;
 import java.util.ArrayList;
 
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test for the Classes.
@@ -67,7 +67,7 @@ public class PraktikumHolonsTestClasses {
 		String str = test2.toStringElements();
 		assertTrue("String not corrent", str.equals("Element, Element"));
 		test2.deleteElement(0);
-		test2.addElements(ele);
+		test2.addElement(ele);
 		assertTrue("Current Energy not corrent", test2.getCurrentEnergy() == 20);
 		assertTrue("Should be Empty", test3.getElements().isEmpty());
 		test3.setElements(test2.copyElements(test2.getElements()));
@@ -82,18 +82,18 @@ public class PraktikumHolonsTestClasses {
 		test3.setState(4);
 		assertTrue("Should be state 4", test3.getState() == 4);
 		assertTrue("Element not Found", test3.searchElement("Element") != null);
-		test1.setElements(new ArrayList<HolonElement>());
+		test1.setElements(new ArrayList<>());
 		assertTrue("Not Empty", !test1.checkIfPartiallySupplied(1));
-		test3.addElements(new HolonElement("Element2", 1, -10));
+		test3.addElement(new HolonElement("Element2", 1, -10));
 		assertTrue("Not Partially Supplied", test3.checkIfPartiallySupplied(1));
-		test3.addElements(new HolonElement("Element2", 2, -10));
+		test3.addElement(new HolonElement("Element2", 2, -10));
 		assertTrue("Not Partially Supplied", test3.checkIfPartiallySupplied(1));
-		test1.addElements(new HolonElement("Element2", 2, -10));
+		test1.addElement(new HolonElement("Element2", 2, -10));
 		assertTrue("minSupply < 0", !test1.checkIfPartiallySupplied(1));
 		Color color = test3.getColor();
 		test3.setColor(new Color(0, 255, 255));
 		assertTrue(color.getBlue() != test3.getColor().getBlue());
-		test3.addElements(new HolonElement("Element3", 3, 50));
+		test3.addElement(new HolonElement("Element3", 3, 50));
 		test3.setState();
 		assertTrue("Should be state 3", test3.getState() == 3);
 		test1.setState();
@@ -165,8 +165,8 @@ public class PraktikumHolonsTestClasses {
 		assertTrue("State not right", edge1.getState());
 		edge1.setState(false);
 		assertTrue("State not right", !edge1.getState());
-		edge2.setTags(new ArrayList<Integer>());
-		edge1.setTags(new ArrayList<Integer>());
+		edge2.setTags(new ArrayList<>());
+		edge1.setTags(new ArrayList<>());
 		assertTrue("Tags not Empty", edge2.getTags().isEmpty());
 		edge2.addTag(1);
 		assertTrue("Tags not Empty", edge1.getTags().isEmpty());

src/ui/controller/Control.java

@@ -1,1022 +1,943 @@
 package ui.controller;
 
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.zip.ZipException;
-
-import org.apache.commons.compress.archivers.ArchiveException;
-
-import com.google.gson.JsonParseException;
-
 import api.CpsAlgorithm;
-import classes.AbstractCpsObject;
-import classes.Category;
-import classes.CpsEdge;
-import classes.CpsNode;
-import classes.CpsUpperNode;
-import classes.HolonElement;
-import classes.HolonObject;
+import classes.*;
+import com.google.gson.JsonParseException;
 import interfaces.CategoryListener;
+import org.apache.commons.compress.archivers.ArchiveException;
 import ui.model.Model;
 import ui.view.FlexiblePane;
 import ui.view.MyCanvas;
 import ui.view.StatisticGraphPanel;
 
+import java.awt.*;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
 /**
  * The Class represents the controller in the model, controller view Pattern.
- * 
- * @author Gruppe14
  *
+ * @author Gruppe14
  */
 public class Control {
 
-	private Model model;
-
-	private final ConsoleController consoleController;
-	private final MultiPurposeController multiPurposeController;
-	private final CategoryController categoryController;
-	private final ObjectController objectController;
-	private final CanvasController canvasController;
-	private final GlobalController globalController;
-	private final SaveController saveController;
-	private final LoadController loadController;
-	private final AutoSaveController autoSaveController;
-	private SimulationManager simulationManager;
-	private final StatsController statsController;
-	private final NodeController nodeController;
-	private final ClipboardController clipboardController;
-	private final HolonCanvasController holonCanvasController;
-	private String autosaveDir = "";
-	private String categoryDir = "";
-	private int rand;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param model
-	 *            the Model
-	 */
-	public Control(Model model) {
-		this.model = model;
-
-		this.multiPurposeController = new MultiPurposeController(model);
-		this.categoryController = new CategoryController(model, multiPurposeController);
-		this.objectController = new ObjectController(model, multiPurposeController);
-		this.canvasController = new CanvasController(model, multiPurposeController);
-		this.globalController = new GlobalController(model);
-		this.saveController = new SaveController(model);
-		this.nodeController = new NodeController(model, canvasController, multiPurposeController);
-		this.loadController = new LoadController(model, categoryController, canvasController, objectController,
-				nodeController, multiPurposeController);
-		this.simulationManager = new SimulationManager(model);
-		this.autoSaveController = new AutoSaveController(model);
-		this.consoleController = new ConsoleController(model);
-		this.statsController = new StatsController(model);
-		this.clipboardController = new ClipboardController(model, saveController, loadController, canvasController,
-				objectController, nodeController, multiPurposeController);
-		this.holonCanvasController = new HolonCanvasController(model);
-
-		autosaveDir = System.getProperty("user.home") + "/.config/HolonGUI/Autosave/";
-		categoryDir = System.getProperty("user.home") + "/.config/HolonGUI/Category/";
-		File autoSave = new File(autosaveDir);
-		File category = new File(categoryDir);
-		// deleteDirectory(dest);
-		autoSave.mkdirs();
-		category.mkdirs();
-		createAutoRandom();
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Generate random number, so that every instance of the program has unique
-	 * save files
-	 */
-	private void createAutoRandom() {
-		rand = (int) (Math.random() * 1000);
-		while (new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
-			rand = (int) Math.random() * 1000;
-		}
-	}
-
-	/**
-	 * Delete a Directory.
-	 * 
-	 * @param path
-	 *            to delete
-	 */
-	public void deleteDirectory(File path) {
-		if (path.exists()) {
-			File[] files = path.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory()) {
-					deleteDirectory(files[i]);
-				} else {
-					if (files[i].getName().contains("" + rand))
-						files[i].delete();
-				}
-			}
-			// path.delete();
-		}
-	}
+    private final ConsoleController consoleController;
+    private final MultiPurposeController multiPurposeController;
+    private final CategoryController categoryController;
+    private final ObjectController objectController;
+    private final CanvasController canvasController;
+    private final GlobalController globalController;
+    private final SaveController saveController;
+    private final LoadController loadController;
+    private final AutoSaveController autoSaveController;
+    private final StatsController statsController;
+    private final NodeController nodeController;
+    private final ClipboardController clipboardController;
+    private final HolonCanvasController holonCanvasController;
+    private Model model;
+    private SimulationManager simulationManager;
+    private String autosaveDir = "";
+    private String categoryDir = "";
+    private int rand;
+
+    /**
+     * Constructor.
+     *
+     * @param model the Model
+     */
+    public Control(Model model) {
+        this.model = model;
+
+        this.multiPurposeController = new MultiPurposeController(model);
+        this.categoryController = new CategoryController(model, multiPurposeController);
+        this.objectController = new ObjectController(model, multiPurposeController);
+        this.canvasController = new CanvasController(model, multiPurposeController);
+        this.globalController = new GlobalController(model);
+        this.saveController = new SaveController(model);
+        this.nodeController = new NodeController(model, canvasController, multiPurposeController);
+        this.loadController = new LoadController(model, categoryController, canvasController, objectController,
+                nodeController, multiPurposeController);
+        this.simulationManager = new SimulationManager(model);
+        this.autoSaveController = new AutoSaveController(model);
+        this.consoleController = new ConsoleController(model);
+        this.statsController = new StatsController(model);
+        this.clipboardController = new ClipboardController(model, saveController, loadController, canvasController,
+                objectController, nodeController, multiPurposeController);
+        this.holonCanvasController = new HolonCanvasController(model);
+
+        autosaveDir = System.getProperty("user.home") + "/.config/HolonGUI/Autosave/";
+        categoryDir = System.getProperty("user.home") + "/.config/HolonGUI/Category/";
+        File autoSave = new File(autosaveDir);
+        File category = new File(categoryDir);
+        // deleteDirectory(dest);
+        autoSave.mkdirs();
+        category.mkdirs();
+        createAutoRandom();
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Generate random number, so that every instance of the program has unique
+     * save files
+     */
+    private void createAutoRandom() {
+        rand = (int) (Math.random() * 1000);
+        while (new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
+            rand = (int) Math.random() * 1000;
+        }
+    }
+
+    /**
+     * Delete a Directory.
+     *
+     * @param path to delete
+     */
+    public void deleteDirectory(File path) {
+        if (path.exists()) {
+            File[] files = path.listFiles();
+            for (int i = 0; i < files.length; i++) {
+                if (files[i].isDirectory()) {
+                    deleteDirectory(files[i]);
+                } else {
+                    if (files[i].getName().contains("" + rand))
+                        files[i].delete();
+                }
+            }
+            // path.delete();
+        }
+    }
 
 	/* Operations for searching */
 
-	/**
-	 * Search for Object by ID.
-	 * 
-	 * @param id
-	 *            the id of the Object
-	 * @return the CpsObject
-	 */
-	public AbstractCpsObject searchByID(int id) {
-		return multiPurposeController.searchByID(id);
-	}
-
-	/**
-	 * Search for Object by ID in upperNode
-	 * 
-	 * @param id
-	 *            the id of the Object
-	 * @return the CpsObject
-	 */
-	public AbstractCpsObject searchByIDUpperNode(int id, CpsUpperNode upperNode) {
-		return multiPurposeController.searchByIDUpperNode(id, upperNode);
-	}
-
-	public AbstractCpsObject searchTracked(int id) {
-		return multiPurposeController.searchByID(id);
-	}
-
-	/**
-	 * Search for Object in a Category.
-	 * 
-	 * @param category
-	 *            name of the Category
-	 * @param object
-	 *            Name of the Object
-	 * @return The Object
-	 */
-	public AbstractCpsObject searchCategoryObject(String category, String object) {
-		return multiPurposeController.searchCatObj(multiPurposeController.searchCat(category), object);
-	}
-
-	/**
-	 * search for category.
-	 * 
-	 * @param cat
-	 *            name of the Category
-	 * @return the Category
-	 */
-	public Category searchCategory(String cat) {
-		return multiPurposeController.searchCat(cat);
-	}
+    /**
+     * Search for Object by ID.
+     *
+     * @param id the id of the Object
+     * @return the CpsObject
+     */
+    public AbstractCpsObject searchByID(int id) {
+        return multiPurposeController.searchByID(id);
+    }
+
+    /**
+     * Search for Object by ID in upperNode
+     *
+     * @param id the id of the Object
+     * @return the CpsObject
+     */
+    public AbstractCpsObject searchByIDUpperNode(int id, CpsUpperNode upperNode) {
+        return multiPurposeController.searchByIDUpperNode(id, upperNode);
+    }
+
+    public AbstractCpsObject searchTracked(int id) {
+        return multiPurposeController.searchByID(id);
+    }
+
+    /**
+     * Search for Object in a Category.
+     *
+     * @param category name of the Category
+     * @param object   Name of the Object
+     * @return The Object
+     */
+    public AbstractCpsObject searchCategoryObject(String category, String object) {
+        return multiPurposeController.searchCatObj(multiPurposeController.searchCat(category), object);
+    }
+
+    /**
+     * search for category.
+     *
+     * @param cat name of the Category
+     * @return the Category
+     */
+    public Category searchCategory(String cat) {
+        return multiPurposeController.searchCat(cat);
+    }
 
 	/* Operations for Categories and Objects */
 
-	/**
-	 * init default category and objects.
-	 * 
-	 * @throws IOException
-	 */
-	public void resetCategorys() throws IOException {
-		categoryController.initCategories();
-		objectController.initHolonElements();
-		saveCategory();
-	}
-
-	/**
-	 * Adds New Category into Model.
-	 * 
-	 * @param cat
-	 *            name of the new Category
-	 * @throws IOException
-	 */
-	public void addCategory(String cat) throws IOException {
-		categoryController.addNewCategory(cat);
-		saveCategory();
-	}
-
-	/**
-	 * Add new Holon Object to a Category.
-	 * 
-	 * @param cat
-	 *            Category
-	 * @param obj
-	 *            New Object Name
-	 * @param ele
-	 *            Array of Elements
-	 * @param img
-	 *            the image Path
-	 * @throws IOException
-	 */
-	public void addObject(Category cat, String obj, ArrayList<HolonElement> ele, String img) throws IOException {
-		categoryController.addNewHolonObject(cat, obj, ele, img);
-		saveCategory();
-	}
-
-	/**
-	 * Add new Holon Transformer to a Category.
-	 * 
-	 * @param cat
-	 *            Category
-	 * @param obj
-	 *            New Object Name
-	 */
-	public void addTransformer(Category cat, String obj) {
-		categoryController.addNewHolonTransformer(cat, obj, "/Images/transformer-1.png");
-	}
-
-	/**
-	 * Add new Holon Switch to a Category.
-	 * 
-	 * @param cat
-	 *            Category
-	 * @param obj
-	 *            New Object Name
-	 * @throws IOException
-	 */
-	public void addSwitch(Category cat, String obj) throws IOException {
-		categoryController.addNewHolonSwitch(cat, obj, "/Images/switch-on.png");
-		saveCategory();
-	}
-
-	/**
-	 * delete a given Category.
-	 * 
-	 * @param cat
-	 *            the Category
-	 * @throws IOException
-	 */
-	public void deleteCategory(String cat) throws IOException {
-		categoryController.deleteCategory(cat);
-		saveCategory();
-	}
-
-	/**
-	 * Delete an Object from a Category.
-	 * 
-	 * @param cat
-	 *            the Category
-	 * @param obj
-	 *            the Object
-	 * @throws IOException
-	 */
-	public void delObjectCategory(String cat, String obj) throws IOException {
-		categoryController.deleteObject(cat, obj);
-		saveCategory();
-	}
-
-	/**
-	 * deletes a selectedObject.
-	 * 
-	 * @param obj
-	 *            Cpsobject
-	 */
-	public void deleteSelectedObject(AbstractCpsObject obj) {
-		objectController.deleteSelectedObject(obj);
-	}
-
-	/**
-	 * add an Object to selectedObject.
-	 * 
-	 * @param obj
-	 *            AbstractCpsobject
-	 */
-	public void addSelectedObject(AbstractCpsObject obj) {
-		objectController.addSelectedObject(obj);
-	}
+    /**
+     * init default category and objects.
+     *
+     * @throws IOException
+     */
+    public void resetCategorys() throws IOException {
+        categoryController.initCategories();
+        objectController.initHolonElements();
+        saveCategory();
+    }
+
+    /**
+     * Adds New Category into Model.
+     *
+     * @param cat name of the new Category
+     * @throws IOException
+     */
+    public void addCategory(String cat) throws IOException {
+        categoryController.addNewCategory(cat);
+        saveCategory();
+    }
+
+    /**
+     * Add new Holon Object to a Category.
+     *
+     * @param cat Category
+     * @param obj New Object Name
+     * @param ele Array of Elements
+     * @param img the image Path
+     * @throws IOException
+     */
+    public void addObject(Category cat, String obj, ArrayList<HolonElement> ele, String img) throws IOException {
+        categoryController.addNewHolonObject(cat, obj, ele, img);
+        saveCategory();
+    }
+
+    /**
+     * Add new Holon Transformer to a Category.
+     *
+     * @param cat Category
+     * @param obj New Object Name
+     */
+    public void addTransformer(Category cat, String obj) {
+        categoryController.addNewHolonTransformer(cat, obj, "/Images/transformer-1.png");
+    }
+
+    /**
+     * Add new Holon Switch to a Category.
+     *
+     * @param cat Category
+     * @param obj New Object Name
+     * @throws IOException
+     */
+    public void addSwitch(Category cat, String obj) throws IOException {
+        categoryController.addNewHolonSwitch(cat, obj, "/Images/switch-on.png");
+        saveCategory();
+    }
+
+    /**
+     * delete a given Category.
+     *
+     * @param cat the Category
+     * @throws IOException
+     */
+    public void deleteCategory(String cat) throws IOException {
+        categoryController.deleteCategory(cat);
+        saveCategory();
+    }
+
+    /**
+     * Delete an Object from a Category.
+     *
+     * @param cat the Category
+     * @param obj the Object
+     * @throws IOException
+     */
+    public void delObjectCategory(String cat, String obj) throws IOException {
+        categoryController.deleteObject(cat, obj);
+        saveCategory();
+    }
+
+    /**
+     * deletes a selectedObject.
+     *
+     * @param obj Cpsobject
+     */
+    public void deleteSelectedObject(AbstractCpsObject obj) {
+        objectController.deleteSelectedObject(obj);
+    }
+
+    /**
+     * add an Object to selectedObject.
+     *
+     * @param obj AbstractCpsobject
+     */
+    public void addSelectedObject(AbstractCpsObject obj) {
+        objectController.addSelectedObject(obj);
+    }
 
 	/* Operations for Canvas */
 
-	/**
-	 * Add a new Object.
-	 * 
-	 * @param object
-	 *            the Object
-	 */
-	public void addObjectCanvas(AbstractCpsObject object) {
-		canvasController.addNewObject(object);
-		simulationManager.calculateStateForTimeStep(model.getCurIteration());
-		if (!(object instanceof CpsNode)) {
-			try {
-				autoSave();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Deletes an CpsObject on the Canvas and its connections.
-	 * 
-	 * @param obj
-	 *            AbstractCpsObject
-	 * @param save
-	 */
-	public void delCanvasObject(AbstractCpsObject obj, boolean save) {
-		canvasController.deleteObjectOnCanvas(obj);
-		calculateStateForCurrentTimeStep();
-		if (obj instanceof CpsUpperNode)
-			canvasController.bfsNodeCleaner((CpsUpperNode) obj);
-		if (save)
-			try {
-				autoSave();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-	}
-
-	/**
-	 * Add an edge to the Canvas.
-	 * 
-	 * @param edge
-	 *            the edge
-	 */
-	public void addEdgeOnCanvas(CpsEdge edge) {
-		canvasController.addEdgeOnCanvas(edge);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Removes an Edge from the Canvas.
-	 * 
-	 * @param edge
-	 *            the edge to remove
-	 */
-	public void removeEdgesOnCanvas(CpsEdge edge) {
-		canvasController.removeEdgesOnCanvas(edge);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Set the selected Edge.
-	 * 
-	 * @param edge
-	 *            that is selected
-	 */
-	public void setSelecteEdge(CpsEdge edge) {
-		model.setSelectedEdge(edge);
-	}
-
-	/**
-	 * Returns the ID of the selected Object 0 = no Object is selected.
-	 * 
-	 * @param id
-	 *            the ID of the selected Object
-	 */
-	public void setSelectedObjectID(int id) {
-		objectController.setSelectedObjectID(id);
-	}
+    /**
+     * Add a new Object.
+     *
+     * @param object the Object
+     */
+    public void addObjectCanvas(AbstractCpsObject object) {
+        canvasController.addNewObject(object);
+        simulationManager.calculateStateForTimeStep(model.getCurIteration());
+        if (!(object instanceof CpsNode)) {
+            try {
+                autoSave();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Deletes an CpsObject on the Canvas and its connections.
+     *
+     * @param obj  AbstractCpsObject
+     * @param save
+     */
+    public void delCanvasObject(AbstractCpsObject obj, boolean save) {
+        canvasController.deleteObjectOnCanvas(obj);
+        calculateStateForCurrentTimeStep();
+        if (obj instanceof CpsUpperNode)
+            canvasController.bfsNodeCleaner((CpsUpperNode) obj);
+        if (save)
+            try {
+                autoSave();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+    }
+
+    /**
+     * Add an edge to the Canvas.
+     *
+     * @param edge the edge
+     */
+    public void addEdgeOnCanvas(CpsEdge edge) {
+        canvasController.addEdgeOnCanvas(edge);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Removes an Edge from the Canvas.
+     *
+     * @param edge the edge to remove
+     */
+    public void removeEdgesOnCanvas(CpsEdge edge) {
+        canvasController.removeEdgesOnCanvas(edge);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Set the selected Edge.
+     *
+     * @param edge that is selected
+     */
+    public void setSelecteEdge(CpsEdge edge) {
+        model.setSelectedEdge(edge);
+    }
+
+    /**
+     * Returns the ID of the selected Object 0 = no Object is selected.
+     *
+     * @param id the ID of the selected Object
+     */
+    public void setSelectedObjectID(int id) {
+        objectController.setSelectedObjectID(id);
+    }
 
 	
 
 	/* Operations for Objects and Elements */
 
-	/**
-	 * Add a new Element into a Object on the Canvas.
-	 * 
-	 * @param id
-	 *            the Object ID
-	 * @param ele
-	 *            the Name of the Element
-	 * @param amount
-	 *            the Amount
-	 * @param energy
-	 *            the Energy
-	 */
-	public void addElementCanvasObject(int id, String ele, int amount, float energy) {
-		objectController.addNewElementIntoCanvasObject(id, ele, amount, energy);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Add a new Element into a Object in Category.
-	 * 
-	 * @param catName
-	 *            the Category
-	 * @param objName
-	 *            the Object
-	 * @param eleName
-	 *            the Element Name
-	 * @param amount
-	 *            the amount
-	 * @param energy
-	 *            the Energy
-	 */
-	public void addElementCategoryObject(String catName, String objName, String eleName, int amount, float energy) {
-		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
-	}
-
-	/**
-	 * deletes a Element from a given Canvas Object.
-	 * 
-	 * @param id
-	 *            the ID
-	 * @param elementid
-	 *            the Element ID
-	 */
-	public void deleteElementCanvas(int id, int elementid) {
-		objectController.deleteElementInCanvas(id, elementid);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
+    /**
+     * Add a new Element into a Object on the Canvas.
+     *
+     * @param objectId  the Object ID
+     * @param ele       the Name of the Element
+     * @param amount    the Amount
+     * @param energy    the Energy
+     * @param elementId the Element ID
+     */
+    public void addElementCanvasObject(int objectId, String ele, int amount, float energy, int elementId) {
+        objectController.addNewElementIntoCanvasObject(objectId, ele, amount, energy, elementId);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Add a new Element into a Object in Category.
+     *
+     * @param catName the Category
+     * @param objName the Object
+     * @param eleName the Element Name
+     * @param amount  the amount
+     * @param energy  the Energy
+     */
+    public void addElementCategoryObject(String catName, String objName, String eleName, int amount, float energy) {
+        objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
+    }
+
+    /**
+     * deletes a Element from a given Canvas Object.
+     *
+     * @param id        the ID
+     * @param elementid the Element ID
+     */
+    public void deleteElementCanvas(int id, int elementid) {
+        objectController.deleteElementInCanvas(id, elementid);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
 
 	/* Global Operations */
 
-	/**
-	 * Add a SubNetColor.
-	 * 
-	 * @param c
-	 *            the Color
-	 */
-	public void addSubNetColor(Color c) {
-		globalController.addSubNetColor(c);
-	}
-
-	/**
-	 * Returns SCALE.
-	 * 
-	 * @return SCALE
-	 */
-	public int getScale() {
-		return globalController.getScale();
-	}
-
-	/**
-	 * Returns SCALE Divided by 2.
-	 * 
-	 * @return SCALE Divided by 2
-	 */
-	public int getScaleDiv2() {
-		return globalController.getScaleDiv2();
-	}
-
-	/**
-	 * Changes the value of SCALE and SCALEDIV2.
-	 * 
-	 * @param s
-	 *            Scale
-	 */
-	public void setScale(int s) {
-		globalController.setScale(s);
-	}
-
-	/**
-	 * sets the current Iteration.
-	 * 
-	 * @param curit
-	 *            the current Iteration
-	 */
-	public void setCurIteration(int curit) {
-		globalController.setCurIteration(curit);
-	}
-
-	/**
-	 * Writes the current State of the Modelling into a JSON File which can be
-	 * loaded.
-	 * 
-	 * @param path
-	 *            the Path
-	 * 
-	 * @throws IOException
-	 *             exception
-	 */
-	public void saveFile(String path) throws IOException, ArchiveException {
-		saveController.writeSave(path);
-	}
-
-	/**
-	 * Reads the the Save File and load the state into the Model.
-	 * 
-	 * @param path
-	 *            the Path
-	 * @throws IOException
-	 *             exception
-	 * @throws ArchiveException
-	 */
-	public void loadFile(String path) throws IOException, ArchiveException, ZipException {
-		loadController.readSave(path);
-		saveCategory();
-		autoSave();
-	}
-
-	/**
-	 * Reads the Json File from Autosave
-	 * 
-	 * @param path
-	 * @throws IOException
-	 */
-	public void loadAutoSave(String path) throws IOException {
-		loadController.readJson(path);
-	}
-
-	/**
-	 * Init the CategoryListener.
-	 * 
-	 * @param catLis
-	 *            the CategoryListener
-	 */
-	public void initListener(CategoryListener catLis) {
-		categoryController.addCategoryListener(catLis);
-	}
-
-	/**
-	 * calculates the flow of the edges and the supply for objects for the
-	 * current Timestep.
-	 */
-	public void calculateStateForCurrentTimeStep() {
-		// simulationManager.reset();
-		simulationManager.calculateStateForTimeStep(model.getCurIteration());
-	}
-
-	/**
-	 * calculates the flow of the edges and the supply for objects.
-	 * 
-	 * @param x
-	 *            current Iteration
-	 */
-	public void calculateStateForTimeStep(int x) {
-		// simulationManager.reset();
-		simulationManager.calculateStateForTimeStep(x);
-	}
-
-	/**
-	 * resets the whole State of the simulation including a reset of all Edges
-	 * to the default "is working" state
-	 */
-	public void resetSimulation() {
-		setIsSimRunning(false);
-		simulationManager.resetSimulation();
-	}
-
-	/**
-	 * Set the Canvas.
-	 * 
-	 * @param can
-	 *            the Canvas
-	 */
-	public void setCanvas(MyCanvas can) {
-		simulationManager.setCanvas(can);
-	}
-
-	/**
-	 * make an autosave.
-	 * 
-	 * @throws IOException
-	 *             Exception
-	 */
-	public void autoSave() throws IOException {
-		autoSaveController.increaseAutoSaveNr();
-		saveController.writeAutosave(autosaveDir + rand + autoSaveController.getAutoSaveNr());
-		if (autoSaveController.allowed()) {
-			new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr() - globalController.getNumbersOfSaves()))
-					.delete();
-		}
-	}
-
-	public void saveCategory() throws IOException {
-		saveController.writeCategory(categoryDir + "Category.json");
-	}
-
-	/**
-	 * Returns the undo save.
-	 * 
-	 * @return the undo save
-	 */
-	public String getUndoSave() {
-		autoSaveController.decreaseAutoSaveNr();
-		if (!new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
-			autoSaveController.increaseAutoSaveNr();
-		}
-		return autosaveDir + rand + (autoSaveController.getAutoSaveNr());
-	}
-
-	/**
-	 * Returns the redo save.
-	 * 
-	 * @return the redo save
-	 */
-	public String getRedoSave() {
-		autoSaveController.increaseAutoSaveNr();
-		if (!new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
-			autoSaveController.decreaseAutoSaveNr();
-		}
-		return autosaveDir + rand + (autoSaveController.getAutoSaveNr());
-	}
-
-	/**
-	 * Getter for Model.
-	 * 
-	 * @return the Model
-	 */
-	public Model getModel() {
-		return model;
-	}
-
-	/**
-	 * get the Simulation Manager.
-	 * 
-	 * @return the Simulation Manager
-	 */
-	public SimulationManager getSimManager() {
-		return simulationManager;
-	}
-
-	/**
-	 * Getter for selected CpsObject.
-	 *
-	 * @param text
-	 *            String the Text
-	 * @param color
-	 *            the color of the Text
-	 * @param p
-	 *            size of the Text
-	 * @param bold
-	 *            bold or not
-	 * @param italic
-	 *            italic or not
-	 * @param nl
-	 *            new line or not
-	 * 
-	 */
-	public void addTextToConsole(String text, Color color, int p, boolean bold, boolean italic, boolean nl) {
-		consoleController.addTextToConsole(text, color, p, bold, italic, nl);
-	}
-
-	/**
-	 * Print Text on the console in black and font size 12.
-	 *
-	 * @param text
-	 *            String the Text
-	 */
-	public void addTextToConsole(String text) {
-		consoleController.addTextToConsole(text);
-	}
-
-	/**
-	 * Clears the console.
-	 */
-	public void clearConsole() {
-		consoleController.clearConsole();
-	}
-
-	/**
-	 * Set the timerSpeed.
-	 * 
-	 * @param t
-	 *            interval in ms
-	 */
-	public void setTimerSpeed(int t) {
-		globalController.setTimerSpeed(t);
-	}
-
-	/**
-	 * Set the Canvas X Size.
-	 * 
-	 * @param canvasX
-	 *            the cANVAS_X to set
-	 */
-	public void setCanvasX(int canvasX) {
-		globalController.setCanvasX(canvasX);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Set the Canvas Y Size.
-	 * 
-	 * @param canvasY
-	 *            the cANVAS_Y to set
-	 */
-	public void setCanvasY(int canvasY) {
-		globalController.setCanvasY(canvasY);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void setMaxCapacity(float cap) {
-		globalController.setMaxCapacity(cap);
-	}
-
-	/**
-	 * Set the Algorithm.
-	 * 
-	 * @param obj
-	 *            the Algorithm
-	 */
-	public void setAlgorithm(Object obj) {
-		multiPurposeController.setAlgorithm(obj);
-	}
-
-	/**
-	 * Run the Algorithm.
-	 */
-	public void runAlgorithm(Model model, Control controller) {
-		if (model.getAlgorithm() != null) {
-			((CpsAlgorithm) model.getAlgorithm()).runAlgorithm(model, controller);
-		}
-	}
-
-	// ========================= MANAGING TRACKED OBJECTS ====================
-
-	public void setTrackingObj(ArrayList<AbstractCpsObject> objArr) {
-		statsController.setTrackingObj(objArr);
-	}
-
-	public ArrayList<AbstractCpsObject> getTrackingObj() {
-		return statsController.getTrackingObj();
-	}
-
-	public void addTrackingObj(AbstractCpsObject obj) {
-		statsController.addTrackingObj(obj);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void removeTrackingObj(AbstractCpsObject obj) {
-		statsController.removeTrackingObj(obj);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	// ========================== MANAGING TRACKED OBJECTS END ================
-
-	/**
-	 * Controlling Nodes of Nodes
-	 */
-
-	public void addUpperNode(String nodeName, CpsUpperNode upperNode, ArrayList<AbstractCpsObject> toGroup) {
-		nodeController.doUpperNode(nodeName, upperNode, toGroup);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void delUpperNode(CpsUpperNode node, CpsUpperNode upperNode) {
-		nodeController.undoUpperNode(node, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void addObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
-		nodeController.addObjectInUpperNode(object, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void delObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
-		nodeController.deleteObjectInUpperNode(object, upperNode);
-		if (object instanceof CpsUpperNode)
-			canvasController.bfsNodeCleaner((CpsUpperNode) object);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	public void addEdgeUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
-		nodeController.addEdge(edge, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void delEdgeUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
-		nodeController.deleteEdge(edge, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void connectNodes(CpsEdge edge, CpsUpperNode upperNode) {
-		nodeController.connectNodes(edge, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void disconnectNodes(CpsEdge edge, CpsUpperNode upperNode) {
-		nodeController.disconnectNodes(edge, upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Get the number of HolonObjects in the given List
-	 * 
-	 * @param list
-	 */
-	public int getNumberHolonObjects(ArrayList<AbstractCpsObject> list) {
-		return objectController.getNumberHolonObjects(list);
-	}
-
-	/**
-	 * Get the number of HolonObjects with the given state in the given List
-	 * 
-	 * @param list
-	 * @param state
-	 */
-	public int getNumberStateObjects(ArrayList<AbstractCpsObject> list, int state) {
-		return objectController.getNumberStateObjects(list, state);
-	}
-
-	/**
-	 * Changes the value of HolonBodySCALE
-	 * 
-	 * @param s
-	 *            HolonBodyScale
-	 */
-	public void setHolonBodyScale(int s) {
-		globalController.setHolonBodyScale(s);
-	}
-
-	/**
-	 * Returns HolonBodySCALE.
-	 * 
-	 * @return SCALE
-	 */
-	public int getHolonBodyScale() {
-		return globalController.getHolonBodyScale();
-	}
-
-	/**
-	 * Sets the ID of the selected HolonBody
-	 * 
-	 * @param i
-	 *            ID of the selected HolonBody
-	 */
-	public void addSelectedHolonBody(int i) {
-		objectController.addSelectedHolonBody(i);
-	}
-
-	/**
-	 * Copy all Selected Objects.
-	 */
-	public void copy(CpsUpperNode upperNode) {
-		clipboardController.copy(upperNode);
-	}
-
-	public void paste(CpsUpperNode upperNode, Point point)
-			throws JsonParseException, UnsupportedFlavorException, IOException {
-		clipboardController.paste(upperNode, point);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void cut(CpsUpperNode upperNode) {
-		clipboardController.cut(upperNode);
-		try {
-			autoSave();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void getObjectsInDepth() {
-		clipboardController.getObjectsInDepth();
-	}
-
-	public float getTotalProduction(ArrayList<AbstractCpsObject> arrayList) {
-		return holonCanvasController.getTotalProduction(arrayList);
-	}
-
-	public float getTotalConsumption(ArrayList<AbstractCpsObject> arrayList) {
-		return holonCanvasController.getTotalConsumption(arrayList);
-	}
-
-	public int getTotalElements(ArrayList<AbstractCpsObject> arrayList) {
-		return holonCanvasController.getTotalElements(arrayList);
-	}
-
-	public int getTotalProducers(ArrayList<AbstractCpsObject> arrayList) {
-		return holonCanvasController.getTotalProducers(arrayList);
-	}
-
-	public int getActiveElements(ArrayList<AbstractCpsObject> arrayList) {
-		return holonCanvasController.getActiveElements(arrayList);
-	}
-
-	/**
-	 * Set the Background Image;
-	 * 
-	 * @param imagePath
-	 *            Image Path
-	 * @param mode
-	 *            Image Mode
-	 * @param width
-	 *            Image custom width
-	 * @param height
-	 *            Image custom height
-	 */
-	public void setBackgroundImage(String imagePath, int mode, int width, int height) {
-		canvasController.setBackgroundImage(imagePath, mode, width, height);
-	}
-
-	public void setFlexiblePane(FlexiblePane fp) {
-		simulationManager.setFlexiblePane(fp);
-	}
-
-	public void setGraphTable(Hashtable<String, StatisticGraphPanel> gT) {
-		model.setGraphTable(gT);
-	}
-
-	public Hashtable<String, StatisticGraphPanel> getGraphTable() {
-		return model.getGraphTable();
-	}
-
-	/**
-	 * Sets if the Simulation is running
-	 */
-	public void setIsSimRunning(boolean isRunning) {
-		globalController.setIsSimRunning(isRunning);
-	}
-
-	/**
-	 * Sets showConsoleLog.
-	 * 
-	 * @param showConsoleLog
-	 */
-	public void setShowConsoleLog(boolean showConsoleLog) {
-		globalController.setShowConsoleLog(showConsoleLog);
-	}
+    /**
+     * Add a SubNetColor.
+     *
+     * @param c the Color
+     */
+    public void addSubNetColor(Color c) {
+        globalController.addSubNetColor(c);
+    }
+
+    /**
+     * Returns SCALE.
+     *
+     * @return SCALE
+     */
+    public int getScale() {
+        return globalController.getScale();
+    }
+
+    /**
+     * Changes the value of SCALE and SCALEDIV2.
+     *
+     * @param s Scale
+     */
+    public void setScale(int s) {
+        globalController.setScale(s);
+    }
+
+    /**
+     * Returns SCALE Divided by 2.
+     *
+     * @return SCALE Divided by 2
+     */
+    public int getScaleDiv2() {
+        return globalController.getScaleDiv2();
+    }
+
+    /**
+     * sets the current Iteration.
+     *
+     * @param curit the current Iteration
+     */
+    public void setCurIteration(int curit) {
+        globalController.setCurIteration(curit);
+    }
+
+    /**
+     * Writes the current State of the Modelling into a JSON File which can be
+     * loaded.
+     *
+     * @param path the Path
+     * @throws IOException exception
+     */
+    public void saveFile(String path) throws IOException, ArchiveException {
+        saveController.writeSave(path);
+    }
+
+    /**
+     * Reads the the Save File and load the state into the Model.
+     *
+     * @param path the Path
+     * @throws IOException      exception
+     * @throws ArchiveException
+     */
+    public void loadFile(String path) throws IOException, ArchiveException {
+        loadController.readSave(path);
+        saveCategory();
+        autoSave();
+    }
+
+    /**
+     * Reads the Json File from Autosave
+     *
+     * @param path
+     * @throws IOException
+     */
+    public void loadAutoSave(String path) throws IOException {
+        loadController.readJson(path);
+    }
+
+    /**
+     * Init the CategoryListener.
+     *
+     * @param catLis the CategoryListener
+     */
+    public void initListener(CategoryListener catLis) {
+        categoryController.addCategoryListener(catLis);
+    }
+
+    /**
+     * calculates the flow of the edges and the supply for objects for the
+     * current Timestep.
+     */
+    public void calculateStateForCurrentTimeStep() {
+        // simulationManager.reset();
+        simulationManager.calculateStateForTimeStep(model.getCurIteration());
+    }
+
+    /**
+     * calculates the flow of the edges and the supply for objects.
+     *
+     * @param x current Iteration
+     */
+    public void calculateStateForTimeStep(int x) {
+        // simulationManager.reset();
+        simulationManager.calculateStateForTimeStep(x);
+    }
+
+    /**
+     * resets the whole State of the simulation including a reset of all Edges
+     * to the default "is working" state
+     */
+    public void resetSimulation() {
+        setIsSimRunning(false);
+        simulationManager.resetSimulation();
+    }
+
+    /**
+     * Set the Canvas.
+     *
+     * @param can the Canvas
+     */
+    public void setCanvas(MyCanvas can) {
+        simulationManager.setCanvas(can);
+    }
+
+    /**
+     * make an autosave.
+     *
+     * @throws IOException Exception
+     */
+    public void autoSave() throws IOException {
+        autoSaveController.increaseAutoSaveNr();
+        saveController.writeAutosave(autosaveDir + rand + autoSaveController.getAutoSaveNr());
+        if (autoSaveController.allowed()) {
+            new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr() - globalController.getNumbersOfSaves()))
+                    .delete();
+        }
+    }
+
+    public void saveCategory() throws IOException {
+        saveController.writeCategory(categoryDir + "Category.json");
+    }
+
+    /**
+     * Returns the undo save.
+     *
+     * @return the undo save
+     */
+    public String getUndoSave() {
+        autoSaveController.decreaseAutoSaveNr();
+        if (!new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
+            autoSaveController.increaseAutoSaveNr();
+        }
+        return autosaveDir + rand + (autoSaveController.getAutoSaveNr());
+    }
+
+    /**
+     * Returns the redo save.
+     *
+     * @return the redo save
+     */
+    public String getRedoSave() {
+        autoSaveController.increaseAutoSaveNr();
+        if (!new File(autosaveDir + rand + (autoSaveController.getAutoSaveNr())).exists()) {
+            autoSaveController.decreaseAutoSaveNr();
+        }
+        return autosaveDir + rand + (autoSaveController.getAutoSaveNr());
+    }
+
+    /**
+     * Getter for Model.
+     *
+     * @return the Model
+     */
+    public Model getModel() {
+        return model;
+    }
+
+    /**
+     * get the Simulation Manager.
+     *
+     * @return the Simulation Manager
+     */
+    public SimulationManager getSimManager() {
+        return simulationManager;
+    }
+
+    /**
+     * Getter for selected CpsObject.
+     *
+     * @param text   String the Text
+     * @param color  the color of the Text
+     * @param p      size of the Text
+     * @param bold   bold or not
+     * @param italic italic or not
+     * @param nl     new line or not
+     */
+    public void addTextToConsole(String text, Color color, int p, boolean bold, boolean italic, boolean nl) {
+        consoleController.addTextToConsole(text, color, p, bold, italic, nl);
+    }
+
+    /**
+     * Print Text on the console in black and font size 12.
+     *
+     * @param text String the Text
+     */
+    public void addTextToConsole(String text) {
+        consoleController.addTextToConsole(text);
+    }
+
+    /**
+     * Clears the console.
+     */
+    public void clearConsole() {
+        consoleController.clearConsole();
+    }
+
+    /**
+     * Set the timerSpeed.
+     *
+     * @param t interval in ms
+     */
+    public void setTimerSpeed(int t) {
+        globalController.setTimerSpeed(t);
+    }
+
+    /**
+     * Set the Canvas X Size.
+     *
+     * @param canvasX the cANVAS_X to set
+     */
+    public void setCanvasX(int canvasX) {
+        globalController.setCanvasX(canvasX);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Set the Canvas Y Size.
+     *
+     * @param canvasY the cANVAS_Y to set
+     */
+    public void setCanvasY(int canvasY) {
+        globalController.setCanvasY(canvasY);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void setMaxCapacity(float cap) {
+        globalController.setMaxCapacity(cap);
+    }
+
+    /**
+     * Set the Algorithm.
+     *
+     * @param obj the Algorithm
+     */
+    public void setAlgorithm(Object obj) {
+        multiPurposeController.setAlgorithm(obj);
+    }
+
+    /**
+     * Run the Algorithm.
+     */
+    public void runAlgorithm(Model model, Control controller) {
+        if (model.getAlgorithm() != null) {
+            ((CpsAlgorithm) model.getAlgorithm()).runAlgorithm(model, controller);
+        }
+    }
+
+    // ========================= MANAGING TRACKED OBJECTS ====================
+
+    public ArrayList<AbstractCpsObject> getTrackingObj() {
+        return statsController.getTrackingObj();
+    }
+
+    public void setTrackingObj(ArrayList<AbstractCpsObject> objArr) {
+        statsController.setTrackingObj(objArr);
+    }
+
+    public void addTrackingObj(AbstractCpsObject obj) {
+        statsController.addTrackingObj(obj);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void removeTrackingObj(AbstractCpsObject obj) {
+        statsController.removeTrackingObj(obj);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    // ========================== MANAGING TRACKED OBJECTS END ================
+
+    /**
+     * Controlling Nodes of Nodes
+     */
+
+    public void addUpperNode(String nodeName, CpsUpperNode upperNode, ArrayList<AbstractCpsObject> toGroup) {
+        nodeController.doUpperNode(nodeName, upperNode, toGroup);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void delUpperNode(CpsUpperNode node, CpsUpperNode upperNode) {
+        nodeController.undoUpperNode(node, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void addObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
+        nodeController.addObjectInUpperNode(object, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void delObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
+        nodeController.deleteObjectInUpperNode(object, upperNode);
+        if (object instanceof CpsUpperNode)
+            canvasController.bfsNodeCleaner((CpsUpperNode) object);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+    }
+
+    public void addEdgeUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
+        nodeController.addEdge(edge, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void delEdgeUpperNode(CpsEdge edge, CpsUpperNode upperNode) {
+        nodeController.deleteEdge(edge, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void connectNodes(CpsEdge edge, CpsUpperNode upperNode) {
+        nodeController.connectNodes(edge, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void disconnectNodes(CpsEdge edge, CpsUpperNode upperNode) {
+        nodeController.disconnectNodes(edge, upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Get the number of HolonObjects in the given List
+     *
+     * @param list
+     */
+    public int getNumberHolonObjects(ArrayList<AbstractCpsObject> list) {
+        return objectController.getNumberHolonObjects(list);
+    }
+
+    /**
+     * Get the number of HolonObjects with the given state in the given List
+     *
+     * @param list
+     * @param state
+     */
+    public int getNumberStateObjects(ArrayList<AbstractCpsObject> list, int state) {
+        return objectController.getNumberStateObjects(list, state);
+    }
+
+    /**
+     * Returns HolonBodySCALE.
+     *
+     * @return SCALE
+     */
+    public int getHolonBodyScale() {
+        return globalController.getHolonBodyScale();
+    }
+
+    /**
+     * Changes the value of HolonBodySCALE
+     *
+     * @param s HolonBodyScale
+     */
+    public void setHolonBodyScale(int s) {
+        globalController.setHolonBodyScale(s);
+    }
+
+    /**
+     * Sets the ID of the selected HolonBody
+     *
+     * @param i ID of the selected HolonBody
+     */
+    public void addSelectedHolonBody(int i) {
+        objectController.addSelectedHolonBody(i);
+    }
+
+    /**
+     * Copy all Selected Objects.
+     */
+    public void copy(CpsUpperNode upperNode) {
+        clipboardController.copy(upperNode);
+    }
+
+    public void paste(CpsUpperNode upperNode, Point point)
+            throws JsonParseException, UnsupportedFlavorException, IOException {
+        clipboardController.paste(upperNode, point);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void cut(CpsUpperNode upperNode) {
+        clipboardController.cut(upperNode);
+        try {
+            autoSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void getObjectsInDepth() {
+        clipboardController.getObjectsInDepth();
+    }
+
+    public float getTotalProduction(ArrayList<AbstractCpsObject> arrayList) {
+        return holonCanvasController.getTotalProduction(arrayList);
+    }
+
+    public float getTotalConsumption(ArrayList<AbstractCpsObject> arrayList) {
+        return holonCanvasController.getTotalConsumption(arrayList);
+    }
+
+    public int getTotalElements(ArrayList<AbstractCpsObject> arrayList) {
+        return holonCanvasController.getTotalElements(arrayList);
+    }
+
+    public int getTotalProducers(ArrayList<AbstractCpsObject> arrayList) {
+        return holonCanvasController.getTotalProducers(arrayList);
+    }
+
+    public int getActiveElements(ArrayList<AbstractCpsObject> arrayList) {
+        return holonCanvasController.getActiveElements(arrayList);
+    }
+
+    /**
+     * Set the Background Image;
+     *
+     * @param imagePath Image Path
+     * @param mode      Image Mode
+     * @param width     Image custom width
+     * @param height    Image custom height
+     */
+    public void setBackgroundImage(String imagePath, int mode, int width, int height) {
+        canvasController.setBackgroundImage(imagePath, mode, width, height);
+    }
+
+    public void setFlexiblePane(FlexiblePane fp) {
+        simulationManager.setFlexiblePane(fp);
+    }
+
+    public Hashtable<String, StatisticGraphPanel> getGraphTable() {
+        return model.getGraphTable();
+    }
+
+    public void setGraphTable(Hashtable<String, StatisticGraphPanel> gT) {
+        model.setGraphTable(gT);
+    }
+
+    /**
+     * Sets if the Simulation is running
+     */
+    public void setIsSimRunning(boolean isRunning) {
+        globalController.setIsSimRunning(isRunning);
+    }
+
+    /**
+     * Sets showConsoleLog.
+     *
+     * @param showConsoleLog
+     */
+    public void setShowConsoleLog(boolean showConsoleLog) {
+        globalController.setShowConsoleLog(showConsoleLog);
+    }
 
 }

src/ui/controller/ObjectController.java

@@ -1,240 +1,209 @@
 package ui.controller;
 
-import java.util.ArrayList;
-
-import classes.Category;
-import classes.CpsUpperNode;
-import classes.AbstractCpsObject;
-import classes.HolonElement;
-import classes.HolonObject;
-import classes.Pair;
+import classes.*;
 import ui.model.Model;
 
+import java.util.ArrayList;
+
 /**
  * Controller for Objects.
- * 
+ *
  * @author Gruppe14
  */
 public class ObjectController {
 
-	private Model model;
-	private MultiPurposeController mpC;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param model
-	 *            Model
-	 * @param mp
-	 *            MultiPurposeController
-	 */
-	public ObjectController(Model model, MultiPurposeController mp) {
-		this.model = model;
-		this.mpC = mp;
-		initHolonElements();
-	}
-
-	/**
-	 * init default Power supply of the Power Plant.
-	 */
-	public void initHolonElements() {
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 10000);
-		addNewElementIntoCategoryObject("Building", "House", "TV", 2, -250);
-		addNewElementIntoCategoryObject("Building", "House", "Fridge", 1, -500);
-		addNewElementIntoCategoryObject("Building", "House", "Radio", 1, -100);
-		addNewElementIntoCategoryObject("Building", "House", "PC", 3, -250);
-		addNewElementIntoCategoryObject("Building", "House", "Light", 5, -50);
-		addNewElementIntoCategoryObject("Building", "House", "Solar Panels", 1, 300);
-	}
-
-	/**
-	 * Adds Element into a Object.
-	 * 
-	 * @param object
-	 *            the Object
-	 * @param element
-	 *            the Element
-	 */
-	public void addElement(HolonObject object, HolonElement element) {
-		object.getElements().add(element);
-	}
-
-	/**
-	 * Adds Element into a Object on the Canvas.
-	 * 
-	 * @param object
-	 *            the Object
-	 * @param element
-	 *            the Element
-	 */
-	public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
-		element.setSaving(null);
-		addElement(object, element);
-	}
-
-	/**
-	 * Add a new Element into a Object on the Canvas.
-	 * 
-	 * @param id
-	 *            the Object ID
-	 * @param element
-	 *            the Name of the Element
-	 * @param amount
-	 *            the Amount
-	 * @param energy
-	 *            the Energy
-	 */
-	public void addNewElementIntoCanvasObject(int id, String element, int amount, float energy) {
-		HolonElement ele = new HolonElement(element, amount, energy);
-		if ((HolonObject) mpC.searchByID(id) == null) {
-			addElementIntoCanvasObject((HolonObject) model.getSelectedCpsObjects().get(0), ele);
-		} else {
-			addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
-		}
-	}
-
-	/**
-	 * Add Element into a Object in Category.
-	 * 
-	 * @param category
-	 *            the Category
-	 * 
-	 * @param object
-	 *            the Object
-	 * @param element
-	 *            the Element
-	 */
-	public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
-		element.setSaving(new Pair<String, String>(category, object));
-		addElement((HolonObject) mpC.searchCatObj(mpC.searchCat(category), object), element);
-	}
-
-	/**
-	 * Add a new Element into a Object in Category.
-	 * 
-	 * @param category
-	 *            the Category
-	 * @param object
-	 *            the Object
-	 * @param element
-	 *            the Element Name
-	 * @param energy
-	 *            the Energy
-	 * @param amount
-	 *            the amount
-	 */
-	public void addNewElementIntoCategoryObject(String category, String object, String element, int amount,
-			float energy) {
-
-		HolonElement ele = new HolonElement(element, amount, energy);
-		addElementIntoCategoryObject(category, object, ele);
-	}
-
-	/**
-	 * deletes a Element from a given Object.
-	 * 
-	 * @param obj
-	 *            the Oject
-	 * @param ele
-	 *            the Element
-	 */
-	public void deleteElement(HolonObject obj, HolonElement ele) {
-		obj.getElements().remove(ele);
-	}
-
-	/**
-	 * deletes a selectedObject.
-	 * 
-	 * @param obj
-	 *            Cpsobject
-	 */
-	public void deleteSelectedObject(AbstractCpsObject obj) {
-		model.getSelectedCpsObjects().remove(obj);
-	}
-
-	/**
-	 * add an Object to selectedObject.
-	 * 
-	 * @param obj
-	 *            AbstractCpsobject
-	 */
-	public void addSelectedObject(AbstractCpsObject obj) {
-		model.getSelectedCpsObjects().add(obj);
-	}
-
-	/**
-	 * deletes a Element from a given Canvas Object.
-	 * 
-	 * @param id
-	 *            the ID
-	 * @param eleid
-	 *            the Element ID
-	 */
-	public void deleteElementInCanvas(int id, int eleid) {
-		HolonObject object = (HolonObject) mpC.searchByID(id);
-		if (object == null) {
-			object = (HolonObject) model.getSelectedCpsObjects().get(0);
-		}
-		HolonElement element = mpC.searchEleById(object, eleid);
-		deleteElement(object, element);
-	}
-
-	/**
-	 * Returns the ID of the selected Object 0 = no Object is selected.
-	 * 
-	 * @param id
-	 *            the ID of the selected Object
-	 */
-	public void setSelectedObjectID(int id) {
-		model.setSelectedObjectID(id);
-	}
-
-	/**
-	 * Get the number of HolonObjects in the given List
-	 * 
-	 * @param list
-	 */
-	public int getNumberHolonObjects(ArrayList<AbstractCpsObject> list) {
-		int val = 0;
-
-		for (AbstractCpsObject obj : list) {
-			if (obj instanceof HolonObject) {
-				val++;
-			} else if (obj instanceof CpsUpperNode) {
-				val += getNumberHolonObjects(((CpsUpperNode) obj).getNodes());
-			}
-		}
-		return val;
-	}
-
-	/**
-	 * Get the number of HolonObjects with the given state in the given List
-	 * 
-	 * @param list
-	 * @param state
-	 */
-	public int getNumberStateObjects(ArrayList<AbstractCpsObject> list, int state) {
-		int val = 0;
-
-		for (AbstractCpsObject obj : list) {
-			if (obj instanceof HolonObject) {
-				if (((HolonObject) obj).getState() == state || (state == 2 && ((HolonObject) obj).getState() == 3)) {
-					val++;
-				}
-			} else if (obj instanceof CpsUpperNode) {
-				val += getNumberStateObjects(((CpsUpperNode) obj).getNodes(), state);
-			}
-		}
-		return val;
-	}
-
-	/**
-	 * add the ID of a HolonBody.
-	 * 
-	 * @param i
-	 *            int
-	 */
-	public void addSelectedHolonBody(int i) {
-		model.setSelectedHolonBody(i);
-	}
+    private Model model;
+    private MultiPurposeController mpC;
+
+    /**
+     * Constructor.
+     *
+     * @param model Model
+     * @param mp    MultiPurposeController
+     */
+    public ObjectController(Model model, MultiPurposeController mp) {
+        this.model = model;
+        this.mpC = mp;
+        initHolonElements();
+    }
+
+    /**
+     * init default Power supply of the Power Plant.
+     */
+    public void initHolonElements() {
+        addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 10000);
+        addNewElementIntoCategoryObject("Building", "House", "TV", 2, -250);
+        addNewElementIntoCategoryObject("Building", "House", "Fridge", 1, -500);
+        addNewElementIntoCategoryObject("Building", "House", "Radio", 1, -100);
+        addNewElementIntoCategoryObject("Building", "House", "PC", 3, -250);
+        addNewElementIntoCategoryObject("Building", "House", "Light", 5, -50);
+        addNewElementIntoCategoryObject("Building", "House", "Solar Panels", 1, 300);
+    }
+
+    /**
+     * Adds Element into a Object.
+     *
+     * @param object  the Object
+     * @param element the Element
+     */
+    public void addElement(HolonObject object, HolonElement element) {
+        object.getElements().add(element);
+    }
+
+    /**
+     * Adds Element into a Object on the Canvas.
+     *
+     * @param object  the Object
+     * @param element the Element
+     */
+    public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
+        element.setSaving(null);
+        addElement(object, element);
+    }
+
+    /**
+     * Add a new Element into a Object on the Canvas.
+     *
+     * @param objectId  the Object ID
+     * @param element   the Name of the Element
+     * @param amount    the Amount
+     * @param energy    the Energy
+     * @param elementId the Element ID
+     */
+    public void addNewElementIntoCanvasObject(int objectId, String element, int amount, float energy, int elementId) {
+        HolonElement ele = new HolonElement(element, amount, energy, elementId);
+        if (mpC.searchByID(objectId) == null) {
+            addElementIntoCanvasObject((HolonObject) model.getSelectedCpsObjects().get(0), ele);
+        } else {
+            addElementIntoCanvasObject((HolonObject) mpC.searchByID(objectId), ele);
+        }
+    }
+
+    /**
+     * Add Element into a Object in Category.
+     *
+     * @param category the Category
+     * @param object   the Object
+     * @param element  the Element
+     */
+    public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
+        element.setSaving(new Pair<>(category, object));
+        addElement((HolonObject) mpC.searchCatObj(mpC.searchCat(category), object), element);
+    }
+
+    /**
+     * Add a new Element into a Object in Category.
+     *
+     * @param category the Category
+     * @param object   the Object
+     * @param element  the Element Name
+     * @param energy   the Energy
+     * @param amount   the amount
+     */
+    public void addNewElementIntoCategoryObject(String category, String object, String element, int amount,
+                                                float energy) {
+
+        HolonElement ele = new HolonElement(element, amount, energy);
+        addElementIntoCategoryObject(category, object, ele);
+    }
+
+    /**
+     * deletes a Element from a given Object.
+     *
+     * @param obj the Oject
+     * @param ele the Element
+     */
+    public void deleteElement(HolonObject obj, HolonElement ele) {
+        obj.getElements().remove(ele);
+    }
+
+    /**
+     * deletes a selectedObject.
+     *
+     * @param obj Cpsobject
+     */
+    public void deleteSelectedObject(AbstractCpsObject obj) {
+        model.getSelectedCpsObjects().remove(obj);
+    }
+
+    /**
+     * add an Object to selectedObject.
+     *
+     * @param obj AbstractCpsobject
+     */
+    public void addSelectedObject(AbstractCpsObject obj) {
+        model.getSelectedCpsObjects().add(obj);
+    }
+
+    /**
+     * deletes a Element from a given Canvas Object.
+     *
+     * @param id    the ID
+     * @param eleid the Element ID
+     */
+    public void deleteElementInCanvas(int id, int eleid) {
+        HolonObject object = (HolonObject) mpC.searchByID(id);
+        if (object == null) {
+            object = (HolonObject) model.getSelectedCpsObjects().get(0);
+        }
+        HolonElement element = mpC.searchEleById(object, eleid);
+        deleteElement(object, element);
+    }
+
+    /**
+     * Returns the ID of the selected Object 0 = no Object is selected.
+     *
+     * @param id the ID of the selected Object
+     */
+    public void setSelectedObjectID(int id) {
+        model.setSelectedObjectID(id);
+    }
+
+    /**
+     * Get the number of HolonObjects in the given List
+     *
+     * @param list
+     */
+    public int getNumberHolonObjects(ArrayList<AbstractCpsObject> list) {
+        int val = 0;
+
+        for (AbstractCpsObject obj : list) {
+            if (obj instanceof HolonObject) {
+                val++;
+            } else if (obj instanceof CpsUpperNode) {
+                val += getNumberHolonObjects(((CpsUpperNode) obj).getNodes());
+            }
+        }
+        return val;
+    }
+
+    /**
+     * Get the number of HolonObjects with the given state in the given List
+     *
+     * @param list
+     * @param state
+     */
+    public int getNumberStateObjects(ArrayList<AbstractCpsObject> list, int state) {
+        int val = 0;
+
+        for (AbstractCpsObject obj : list) {
+            if (obj instanceof HolonObject) {
+                if (((HolonObject) obj).getState() == state || (state == 2 && ((HolonObject) obj).getState() == 3)) {
+                    val++;
+                }
+            } else if (obj instanceof CpsUpperNode) {
+                val += getNumberStateObjects(((CpsUpperNode) obj).getNodes(), state);
+            }
+        }
+        return val;
+    }
+
+    /**
+     * add the ID of a HolonBody.
+     *
+     * @param i int
+     */
+    public void addSelectedHolonBody(int i) {
+        model.setSelectedHolonBody(i);
+    }
 }

src/ui/view/GUI.java

@@ -1,5 +1,24 @@
 package ui.view;
 
+import classes.*;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import interfaces.CategoryListener;
+import org.apache.commons.compress.archivers.ArchiveException;
+import ui.controller.Control;
+import ui.controller.UpdateController;
+import ui.model.Model;
+
+import javax.swing.*;
+import javax.swing.border.LineBorder;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.*;
@@ -10,67 +29,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.stream.Collectors;
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JToolBar;
-import javax.swing.JTree;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
-import javax.swing.border.LineBorder;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeCellRenderer;
-
-import org.apache.commons.compress.archivers.ArchiveException;
-
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import classes.AbstractCpsObject;
-import classes.Category;
-import classes.CpsUpperNode;
-import classes.HolonElement;
-import classes.HolonObject;
-import classes.HolonSwitch;
-import classes.HolonTransformer;
-import classes.IdCounter;
-import classes.IdCounterElem;
-import classes.TrackedDataSet;
-import interfaces.CategoryListener;
-import ui.controller.Control;
-import ui.controller.UpdateController;
-import ui.model.Model;
-
-import javax.swing.SwingConstants;
-import javax.swing.Box;
 
 /**
  * Graphical User Interface.
@@ -80,14 +38,7 @@ import javax.swing.Box;
  */
 public class GUI<E> implements CategoryListener {
 
-    // for doubleclick
-    private boolean click = false;
-
-    private JFrame frmCyberPhysical;
-
     private final AlgorithmMenu algorithmMenu;
-
-    private JTabbedPane tabTemp; // tabbedPane or tabbedPane2
     private final JMenuBar menuBar = new JMenuBar();
     private final JMenu mnNewMenu = new JMenu("File");
     private final JMenu mnNewMenuEdit = new JMenu("Edit");
@@ -105,30 +56,20 @@ public class GUI<E> implements CategoryListener {
     private final JSplitPane splitPane = new JSplitPane();
     private final JSplitPane splitPane1 = new JSplitPane();
     private final JSplitPane splitPaneCanvasConsole = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-
     private final JScrollPane canvasSP = new JScrollPane();
     private final JScrollPane scrollPane1 = new JScrollPane();
     // private final JScrollPane holonSP = new JScrollPane();
     private final JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
     private final JTabbedPane tabbedPane2 = new JTabbedPane(JTabbedPane.TOP);
-    private JSplitPane tempSplit;
-    private boolean initSplit = true;
-
     private final JPopupMenu popmenuEdit = new JPopupMenu();
     private final JMenuItem editItem = new JMenuItem("Edit Object");
-    private String catOfObjToBeEdited;
-    private FlexiblePane flexPane;
     private final StatisticPanel statSplitPane;
     private final JScrollPane statScrollPane;
-    private UpperNodeCanvas unc;
-    private JPanel contentPane;
-
     private final JLabel maxGraph = new JLabel("100%");
     private final JLabel medGraph = new JLabel("50%");
     private final JLabel minGraph = new JLabel("0%");
     private final JLabel elementGraph = new JLabel("None ");
     private final ArrayList<HolonElement> selectedElements = new ArrayList<>();
-    private String holonEleNamesDisplayed = "None ";
     private final JTree tree = new JTree();
     /******************************************
      ************* Right Container*************
@@ -139,14 +80,9 @@ public class GUI<E> implements CategoryListener {
      **/
     private final JSplitPane splitHolonElPro = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
     private final JSplitPane splitGraphHolonEl = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-
-    // In this section are all the Holonelements that correspond to the clicked
-    // HolonObject with consumption/production, name and amount.
-
     // Model for single or multi selection
     private final JPanel scrollElements = new JPanel();
     private final JScrollPane tableHolonElementScrollPane = new JScrollPane();
-
     // In this section are all the properties that correspond to the clicked
     // HolonObject, such as connections, name, Type, etc.
     // Table for Properties --> Cell with (0,1) is editable by CpsObjt and
@@ -175,51 +111,35 @@ public class GUI<E> implements CategoryListener {
     };
     private final JPanel graphLabel = new JPanel();
     private final JScrollPane scrollProperties = new JScrollPane();
-
     // In this section is the graph for the selected HolonElement of the clicked
     // HolonObject
     private final JTable tableGraph = new JTable();
     private final DefaultTableModel tableModelGraph = new DefaultTableModel();
     private final JScrollPane scrollGraph = new JScrollPane();
-
     private final Model model;
     private final Control controller;
 
-    // Pop up Windows
-    private AddObjectPopUp addObjectPopUP;
-    private AboutUsPopUp aboutUsPopUp;
-    private AddElementPopUp addElementPopUp;
-
+    // In this section are all the Holonelements that correspond to the clicked
+    // HolonObject with consumption/production, name and amount.
     private final JPanel panel = new JPanel();
     private final JPanel panelHolonEl = new JPanel();
     private final JComboBox comboBox = new JComboBox();
-    // private final JComboBox comboBoxGraph = new JComboBox();
-
     // Buttons
     private final JButton btnAdd = new JButton("+");
     private final JButton btnDel = new JButton("-");
     private final JButton btnAddHolEL = new JButton("+");
     private final JButton btnDelHolEL = new JButton("-");
     private final JButton resetGraphBtn = new JButton("Reset");
-
     private final JToolBar toolBar = new JToolBar();
     private final JToolBar toolBarHolonEl = new JToolBar();
     private final JToolBar toolBarGraph = new JToolBar();
-
     // Languages
     private final JMenuItem englishBtn = new JMenuItem("EN");
     private final JMenuItem spanishBtn = new JMenuItem("ES");
     private final JMenuItem germanBtn = new JMenuItem("DE");
     private final JMenuItem czechBtn = new JMenuItem("CZ");
     private final JMenuItem chineseBtn = new JMenuItem("ZH");
-
-    // variables
-    private boolean dragging = false;
-    private String actualObjectClicked;
-    private Image img = null;
-    private AbstractCpsObject tempCps = null;
-    private int yValueElements = 0;
-
+    // private final JComboBox comboBoxGraph = new JComboBox();
     private final Console console = new Console();
     private final MyCanvas canvas;
     private final HolonCanvas holonCanvas;
@@ -227,20 +147,6 @@ public class GUI<E> implements CategoryListener {
     private final JSplitPane splitPane3 = new JSplitPane();
     private final JSlider sizeSlider = new JSlider();
     private final JLabel lblImageSize = new JLabel(Languages.getLanguage()[94]);
-    // Time Stuff
-    private TimePanel timePanel;
-    // Coord for all Cells with text
-    private int yThis;
-    private int xThis;
-    // Coord for all Cells with boolean values (checkbox)
-    private int yBTis;
-    private int xBThis;
-    // Coord for the Edit-Modus in the PropertieTable
-    private int yProThis;
-    private int xProThis;
-    private int yProThisOneClick;
-    private int xProThisOneClick;
-    private AbstractCpsObject temp = null;
     private final JMenuItem mntmUndo = new JMenuItem("Undo");
     private final JMenuItem mntmRedo = new JMenuItem("Redo");
     private final JMenuItem mntmEditEdges = new JMenuItem("Edge Properties");
@@ -248,23 +154,56 @@ public class GUI<E> implements CategoryListener {
     private final JMenuItem mntmEditShowedInformation = new JMenuItem("Edit showed Information");
     private final JMenuItem mntmResetCategory = new JMenuItem("Reset Categories");
     private final JMenu mnLanguage = new JMenu("Language");
-
     private final String[] columnNamesMulti = {"Object", "Nr.", "Device", "Energy", "Flexibility", "Quantity", "Activated",
             "Flex. activated"};
     private final String[] columnNamesSingle = {"Nr.", "Device", "Energy", "Flexibility", "Quantity", "Activated",
             "Flex. activated"};
     private final ArrayList<PropertyTable> tables = new ArrayList<>();
     private final String[] comboBoxCat = {"Category", "Object", "Switch"};
-    private String warningText = "Warning";
-    private String saveBeforeNew = "Do you want to save your current data?";
-    private String eraseCategory = "Do you really want to delete the Category ";
-    private String selectObjBeforeErase = "Please select a Category or an Object in order to delete something.";
-
     private final UpdateController updCon;
     private final JSplitPane splitPane_1 = new JSplitPane();
     private final JSlider holonBodySizeSlider = new JSlider();
     private final JLabel lblHolonBodySize = new JLabel("HolonBody SIze");
     private final JLabel lblSelectedElement = new JLabel("Selected Element: ");
+    // for doubleclick
+    private boolean click = false;
+    private JFrame frmCyberPhysical;
+    private JTabbedPane tabTemp; // tabbedPane or tabbedPane2
+    private JSplitPane tempSplit;
+    private boolean initSplit = true;
+    private String catOfObjToBeEdited;
+    private FlexiblePane flexPane;
+    private UpperNodeCanvas unc;
+    private JPanel contentPane;
+    private String holonEleNamesDisplayed = "None ";
+    // Pop up Windows
+    private AddObjectPopUp addObjectPopUP;
+    private AboutUsPopUp aboutUsPopUp;
+    private AddElementPopUp addElementPopUp;
+    // variables
+    private boolean dragging = false;
+    private String actualObjectClicked;
+    private Image img = null;
+    private AbstractCpsObject tempCps = null;
+    private int yValueElements = 0;
+    // Time Stuff
+    private TimePanel timePanel;
+    // Coord for all Cells with text
+    private int yThis;
+    private int xThis;
+    // Coord for all Cells with boolean values (checkbox)
+    private int yBTis;
+    private int xBThis;
+    // Coord for the Edit-Modus in the PropertieTable
+    private int yProThis;
+    private int xProThis;
+    private int yProThisOneClick;
+    private int xProThisOneClick;
+    private AbstractCpsObject temp = null;
+    private String warningText = "Warning";
+    private String saveBeforeNew = "Do you want to save your current data?";
+    private String eraseCategory = "Do you really want to delete the Category ";
+    private String selectObjBeforeErase = "Please select a Category or an Object in order to delete something.";
     private Component horizontalStrut = Box.createHorizontalStrut(20);
 
     /**
@@ -292,6 +231,33 @@ public class GUI<E> implements CategoryListener {
         updCon = new UpdateController(model, controller);
     }
 
+    /**
+     * Adds a Popup.
+     *
+     * @param component Component
+     * @param popup     PopupMenu
+     */
+    private static void addPopup(Component component, final JPopupMenu popup) {
+        component.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    showMenu(e);
+                }
+            }
+
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    showMenu(e);
+                }
+            }
+
+            private void showMenu(MouseEvent e) {
+                popup.show(e.getComponent(), e.getX(), e.getY());
+            }
+
+        });
+    }
+
     /**
      * Initialize the contents of the frame.
      */
@@ -914,7 +880,7 @@ public class GUI<E> implements CategoryListener {
                     HolonElement ele = addElementPopUp.getElement();
                     if (ele != null) {
                         controller.addElementCanvasObject(tempCpsObject.getId(), ele.getEleName(), ele.getAmount(),
-                                ele.getEnergy());
+                                ele.getEnergy(), ele.getId());
                     }
                     updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
                     updCon.refreshTableProperties(model.getPropertyTable());
@@ -2022,33 +1988,6 @@ public class GUI<E> implements CategoryListener {
         return frmCyberPhysical;
     }
 
-    /**
-     * Adds a Popup.
-     *
-     * @param component Component
-     * @param popup     PopupMenu
-     */
-    private static void addPopup(Component component, final JPopupMenu popup) {
-        component.addMouseListener(new MouseAdapter() {
-            public void mousePressed(MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    showMenu(e);
-                }
-            }
-
-            public void mouseReleased(MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    showMenu(e);
-                }
-            }
-
-            private void showMenu(MouseEvent e) {
-                popup.show(e.getComponent(), e.getX(), e.getY());
-            }
-
-        });
-    }
-
     private void refreshLanguages() {
         String[] tempArray = Languages.getLanguage();
         // ToolBar