X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..a8c316ac06c17368f52aff8c009e63421103cc24:/examples/java/surfCpuModel/CpuConstantModel.java diff --git a/examples/java/surfCpuModel/CpuConstantModel.java b/examples/java/surfCpuModel/CpuConstantModel.java index 7f7d418e75..7118ff4c5e 100644 --- a/examples/java/surfCpuModel/CpuConstantModel.java +++ b/examples/java/surfCpuModel/CpuConstantModel.java @@ -10,16 +10,14 @@ public class CpuConstantModel extends CpuModel { private List cpus = new ArrayList(); public CpuConstantModel() { - super("Cpu Constant"); Msg.info("Initialize Cpu Constant Model"); } - public Cpu createResource(String name, double[] power_peak, int pstate, double power_scale, TmgrTrace power_trace, int core, ResourceState state_initial, TmgrTrace state_trace, XbtDict cpu_properties) { + public Cpu createCpu(String name, double[] power_peak, int pstate, double power_scale, TmgrTrace power_trace, int core, ResourceState state_initial, TmgrTrace state_trace) { Msg.info("New Cpu("+name+", "+power_peak[pstate]+", "+power_scale+")"); - CpuConstant res = new CpuConstant(this, name, cpu_properties, core, power_peak[pstate], power_scale); + CpuConstant res = new CpuConstant(this, name, core, power_peak[pstate], power_scale); cpus.add(res); - Surf.setCpu(name, res); return res; } @@ -56,9 +54,9 @@ public class CpuConstantModel extends CpuModel { public class CpuConstant extends Cpu { private List actions = new ArrayList(); - public CpuConstant(CpuConstantModel model, String name, XbtDict props, + public CpuConstant(CpuConstantModel model, String name, int core, double powerPeak, double powerScale) { - super(model, name, props, core, powerPeak, powerScale); + super(model, name, core, powerPeak, powerScale); } public void remove(CpuConstantAction action){