Index: WoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/NodeGroupEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/NodeGroupEEP.java	(revision 1301)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package test.thermal.recs.plugins.energy;
-
-import schedframe.resources.computing.Node;
-import schedframe.resources.computing.coolemall.NodeGroup;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.devices.PhysicalResource;
-import schedframe.scheduling.manager.tasks.JobRegistry;
-import example.energy.BaseEnergyEstimationPlugin;
-
-public class NodeGroupEEP extends BaseEnergyEstimationPlugin{
-
-	public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
-			PhysicalResource resource) {
-		
-		double powerConsumption = 0;
-		NodeGroup nodeGroup = (NodeGroup)resource;
-		
-		for(Node node: nodeGroup.getNodes()){
-			try{
-				powerConsumption = powerConsumption + node.getPowerInterface().getRecentPowerUsage().getValue();
-			} catch (Exception e){
-			}
-		}
-		//System.out.println(resource.getName() + ": power = " + powerConsumption);
-
-		return powerConsumption;
-	}
-
-}
Index: WoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/FanEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/FanEEP.java	(revision 1301)
+++ 	(revision )
@@ -1,52 +1,0 @@
-package test.thermal.recs.plugins.energy;
-
-import example.energy.BaseEnergyEstimationPlugin;
-
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.devices.Device;
-import schedframe.resources.devices.PhysicalResource;
-import schedframe.scheduling.manager.tasks.JobRegistry;
-
-public class FanEEP extends BaseEnergyEstimationPlugin {
-
-	public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
-		
-		return ThermalConstants.fanPower;
-	}
-	
-	public double estimateTemperature(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
-		
-		double temp = 0;
-		
-		// thermal constants
-		double tin = ThermalConstants.tin;
-		double Q = ThermalConstants.Q;
-		double C = ThermalConstants.C;
-		double delta1 = ThermalConstants.delta1;
-		double delta2 = ThermalConstants.delta2;
-		double ro = ThermalConstants.ro;
-		
-		Device device = (Device) resource; 
-		Integer device_id = Integer.parseInt(device.getName().split("_")[1]);
-		String device_type = device.getName().split("_")[0];
-		if (device_type.equals("Outlet")){
-			double power1 = 0;
-			double power2 = 0;
-			for(PhysicalResource compResource: device.getComputingResource().getChildren()){
-				Integer node_id = Integer.parseInt(compResource.getName().split("_")[1]);
-				if(node_id == device_id){
-					power2 = compResource.getPowerInterface().getRecentPowerUsage().getValue();
-				}else if(node_id - device_id == 9){
-					power1 = compResource.getPowerInterface().getRecentPowerUsage().getValue();
-				}
-			}
-			temp = tin + delta1 * (power1/(Q * C * ro)) +  delta2 * (power2/(Q * C * ro));;
-		}else if (device_type.equals("Inlet")){
-			temp = tin;
-		}
-		
-		System.out.println(resource.getName());
-		return temp;
-		
-	}
-}
Index: WoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/thermal/recs/plugins/energy/NodeEEP.java	(revision 1301)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package test.thermal.recs.plugins.energy;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import schedframe.resources.computing.Node;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.devices.PhysicalResource;
-import schedframe.scheduling.manager.tasks.JobRegistry;
-
-public class NodeEEP extends RecsNodeBaseEEP {
-
-	public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
-		double powerConsumption = 0;
-		Node node = (Node) resource;
-		
-		try {
-			if(jobRegistry.getRunningTasks().size() > 0) {
-				powerConsumption = powerConsumption + getMeasuredPower(createQuery(jobRegistry.getRunningTasks().get(0)));
-			}
-			else {
-				try {
-					powerConsumption = powerConsumption + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
-				} catch (NoSuchFieldException e) {
-				}
-			}
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		return powerConsumption;
-	}
-	
-	public double estimateTemperature(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
-		
-		double tout = 0;
-		double power1 = 0;
-		double power2 = 0;
-		
-		// thermal constants
-		double tin = ThermalConstants.tin;
-		double Q = ThermalConstants.Q;
-		double C = ThermalConstants.C;
-		double delta1 = ThermalConstants.delta1;
-		double delta2 = ThermalConstants.delta2;
-		double ro = ThermalConstants.ro;
-		
-		
-		Integer resId = Integer.parseInt(resource.getName().split("_")[1]);
-		Node node = (Node)resource;
-		//we estimate outlet temperature (related to the temperature of the nodes placed in outlet row)
-		for(PhysicalResource compResource: node.getParent().getChildren()){
-			Integer id = Integer.parseInt(compResource.getName().split("_")[1]);
-			//we take into account the power of nodes placed "behind" the given nodes
-			if(id - resId == 9){
-				power1 = compResource.getPowerInterface().getRecentPowerUsage().getValue();
-				power2 = resource.getPowerInterface().getRecentPowerUsage().getValue();
-			}else if(id - resId == -9){
-				power1 = resource.getPowerInterface().getRecentPowerUsage().getValue();
-				power2 = compResource.getPowerInterface().getRecentPowerUsage().getValue();
-			}
-		}
-		
-		tout = tin + delta1 * (power1/(Q * C * ro)) +  delta2 * (power2/(Q * C * ro));;
-		
-		return tout;
-	}
-
-}
