Deleted old sign variable in HolonElement

src/classes/HolonElement.java

@@ -39,9 +39,8 @@ public class HolonElement implements IGraphedElement{
     /* Flexibility (meaning the actual */
     @Expose
     private float flexibleEnergyAvailable;
-    /* -: for Consumers and +: Producers */
-    @Expose
-    private char sign;
+
+    
     /* Place where the Object is Stored */
     @Expose
     private Pair<String, String> saving;
@@ -105,7 +104,6 @@ public class HolonElement implements IGraphedElement{
         setAmount(amount);
         setEnergyPerElement(energy);
         setActive(true);
-        setSign(energy);
         setAvailableEnergyPerElementAt(energy);
         setGraphPoints(new LinkedList<>());
         setId(id);
@@ -126,7 +124,6 @@ public class HolonElement implements IGraphedElement{
         setAmount(element.getAmount());
         setEnergyPerElement(element.getEnergyPerElement());
         setActive(element.isActive());
-        setSign(element.getEnergyPerElement());
         setAvailableEnergyPerElementAt(element.getEnergyPerElement());
         for (int i = 0; i < availableEnergyPerElementAt.length; i++) {
             availableEnergyPerElementAt[i] = element.getAvailableEnergyAt(i);
@@ -248,7 +245,6 @@ public class HolonElement implements IGraphedElement{
      */
     public void setEnergyPerElement(float energyPerElement) {
         this.energyPerElement = energyPerElement;
-        setSign(energyPerElement);
     }
 
     /**
@@ -295,26 +291,6 @@ public class HolonElement implements IGraphedElement{
         }
     }
 
-    /**
-     * 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.

src/classes/HolonObject.java

@@ -134,10 +134,9 @@ public class HolonObject extends AbstractCpsObject {
     }
 
     /**
-     * Doesn't take into account which timestep is watched, calculates the max
-     * values.
+     * Calculate the maximum energy a holonObject can consume from all object that are aktive this moment;
      *
-     * @return the currentEnergy
+     * @return the maximal active energy possibel
      */
     public float getMaxActiveEnergy() {
         float temp = 0;
@@ -515,11 +514,11 @@ public class HolonObject extends AbstractCpsObject {
             float valueProd = 0;
             float valueCons = 0;
             for (HolonElement e : getElements()) {
-                if (e.isActive() && e.getSign() == '+') {
-                    valueProd = valueProd + e.getOverallEnergyAtTimeStep(i);
+                if (e.isActive() && e.isProducer()) {
+                    valueProd += e.getOverallEnergyAtTimeStep(i);
                 }
-                if (e.isActive() && e.getSign() == '-') {
-                    valueCons = valueCons + e.getOverallEnergyAtTimeStep(i);
+                if (e.isActive() && !e.isProducer()) {
+                    valueCons += e.getOverallEnergyAtTimeStep(i);
                 }
             }
             tempProd[i] = valueProd;

tests/tests/PraktikumHolonsTestClasses.java

@@ -196,7 +196,6 @@ public class PraktikumHolonsTestClasses {
 		ele2.setAmount(5);
 		assertTrue("Amount not correct", ele2.getAmount() == 5);
         assertTrue("Total Energy not Correct", ele2.getOverallEnergy() == ele2.getAmount() * ele2.getEnergyPerElement());
-        assertTrue("Sign not correct", ele2.getSign() == '-');
 //		ele3.setSav("CVS");
 //		assertTrue("SAV not correct", ele3.getSav().equals("CVS"));
 	}