diff --git a/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java b/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java index 94a66de50d7944abc4cb742ca90cfbd35aeae681..66443d76eabb6f7af5c3c49cfa026956a7b2d6d4 100644 --- a/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java +++ b/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java @@ -128,7 +128,20 @@ public class MultiStateEnergyComponent implements EnergyComponent{ */ public EnergyState getSleepState() { for(EnergyState es : states) { - if(es.getName().contains("sleep")) { + if(es.getName().toUpperCase().contains("SLEEP")) { + return es; + } + } + return null; + } + + /** + * Returns the first state with the string active in its name + * @return the active state + */ + public EnergyState getActiveState() { + for(EnergyState es : states) { + if(es.getName().toUpperCase().contains("ACTIVE")) { return es; } } diff --git a/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java b/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java index 2c128d6b5b68f83d2ba04e7c872b49c3fb0d29a9..97e7776870cd0b857bc251145f848571e5d63bb3 100644 --- a/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java +++ b/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java @@ -79,7 +79,7 @@ public class GenericMicrocontroller implements EnergyAwareHostComponent { this.active = true; EnergyState stateActive = new DefaultEnergyState("active", energyConsumptionActive); - EnergyState stateSleep = new DefaultEnergyState("active", energyConsumptionSleep); + EnergyState stateSleep = new DefaultEnergyState("sleep", energyConsumptionSleep); List states = new LinkedList<>(); states.add(stateActive);