X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16e217262bde55e7e758bb6921fc5b23997aeb59..bbe2fa7b0c1edfa11b9c327be81d0fc6d005ab05:/examples/java/cloud/energy/Main.java

diff --git a/examples/java/cloud/energy/Main.java b/examples/java/cloud/energy/Main.java
index 875777e48d..931d2fd50f 100644
--- a/examples/java/cloud/energy/Main.java
+++ b/examples/java/cloud/energy/Main.java
@@ -1,10 +1,9 @@
-/* Copyright (c) 2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-//package cloud.energy;
+package cloud.energy;
 
 import org.simgrid.msg.Host;
 import org.simgrid.msg.HostNotFoundException;
@@ -12,31 +11,23 @@ import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
 public class Main {
-    private static boolean endOfTest = false;
 
-    public static void setEndOfTest(){
-        endOfTest=true;
-    }
+	public static void main(String[] args) throws NativeException, HostNotFoundException {
+		/* Init. internal values */
+		Msg.energyInit();
+		Msg.init(args);
 
-    public static boolean isEndOfTest(){
-        return endOfTest;
-    }
+		if (args.length < 1) {
+			Msg.info("Usage: Main platform_file.xml");
+			System.exit(1);
+		}
 
-    public static void main(String[] args) throws NativeException {
-       /* Init. internal values */
-        Msg.energyInit();
-        Msg.init(args);
+		/* construct the platform */
+		Msg.createEnvironment(args[0]);
+		
+		/* Create and start a runner for the experiment */
+		new EnergyVMRunner(Host.all()[0],"energy VM runner",null).start();
 
-        if (args.length < 1) {
-            Msg.info("Usage  : Main platform_file.xml deployment_file.xml");
-            System.exit(1);
-        }
-
-       /* construct the platform and deploy the application */
-        Msg.createEnvironment(args[0]);
-        Msg.deployApplication(args[1]);
-
-        Msg.run();
-
-    }
+		Msg.run();
+	}
 }