X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e28a9a1f0dfaa7161fa5b5e65c4515afdd88b3b1..611d822b02f836d7abe031cced6adc4281ef4356:/examples/java/cloud/masterworker/Main.java

diff --git a/examples/java/cloud/masterworker/Main.java b/examples/java/cloud/masterworker/Main.java
index 9b678b9c26..6f36e7dd5f 100644
--- a/examples/java/cloud/masterworker/Main.java
+++ b/examples/java/cloud/masterworker/Main.java
@@ -1,38 +1,47 @@
-/* Copyright (c) 2012-2014, 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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.masterworker;
 
+import java.io.File;
+
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.MsgException;
 
 class Main {
-  public static final double task_comp_size = 10;
-  public static final double task_comm_size = 10;
-  public static final int hostNB = 2 ; 
-  public static void main(String[] args) throws MsgException {
+  public static final double TASK_COMP_SIZE = 10;
+  public static final double TASK_COMM_SIZE = 10;
+  public static final int NHOSTS = 6;
+  public static final int NSTEPS = 50;
+
+  private Main() {
+    throw new IllegalAccessError("Utility class");
+  }
+
+  public static void main(String[] args) {
     Msg.init(args); 
 
-    if (args.length < 1) {
-      Msg.info("Usage   : Main platform_file");
-      Msg.info("Usage  : Main ../platforms/platform.xml");
-      System.exit(1);
+    String platfFile = "../../examples/platforms/small_platform.xml";
+    if (args.length >= 1)
+    	platfFile = args[0];
+    
+    File f = new File(platfFile); 
+    if (!f.exists()) {
+      Msg.error("File " + platfFile + " does not exist in " + System.getProperty("user.dir"));
+      Msg.error("Usage  : Main ../platforms/platform.xml");
     }
-
-    /* Construct the platform */
-    Msg.createEnvironment(args[0]);
+    
+    Msg.createEnvironment(platfFile);
     Host[] hosts = Host.all();
-    if (hosts.length < hostNB+1) {
-      Msg.info("I need at least "+ (hostNB+1) +"  hosts in the platform file, but " + args[0] + " contains only "
+    if (hosts.length < NHOSTS+1) {
+      Msg.info("I need at least "+ (NHOSTS+1) +"  hosts in the platform file, but " + args[0] + " contains only "
                + hosts.length + " hosts");
       System.exit(42);
     }
-    Msg.info("Start"+ hostNB +"  hosts");
     new Master(hosts[0],"Master",hosts).start();
+    
     /* Execute the simulation */
     Msg.run();
   }