[Jason-developers] SF.net SVN: jason:[1766] trunk

[<jom...@us...>]

Revision: 1766
          http://sourceforge.net/p/jason/svn/1766
Author:   jomifred
Date:     2013-12-10 17:53:48 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
fix a bug related to the generated scripts for Jade

Modified Paths:
--------------
    trunk/bin/mas2j.sh
    trunk/demos/distributed-jade/case2/myAllocator.java
    trunk/lib/moise.jar
    trunk/src/jason/infra/jade/JadeMASLauncherAnt.java
    trunk/src/jason/jeditplugin/Config.java

Modified: trunk/bin/mas2j.sh
===================================================================
--- trunk/bin/mas2j.sh	2013-12-10 12:14:10 UTC (rev 1765)
+++ trunk/bin/mas2j.sh	2013-12-10 17:53:48 UTC (rev 1766)
@@ -19,7 +19,7 @@
 
 cd $CURDIR
 
-java -classpath bin/classes:$JASONDIR/lib/jason.jar:$JASONDIR/lib/saci.jar:$JASONDIR/lib/jade.jar:$JASONDIR/lib/c4jason.jar:$JASONDIR/lib/cartago.jar:$JASONDIR/lib/jacamo.jar:$CLASSPATH:. \
+java -classpath bin/classes:$JASONDIR/lib/jason.jar:$JASONDIR/lib/jade.jar:$JASONDIR/lib/c4jason.jar:$JASONDIR/lib/cartago.jar:$JASONDIR/lib/jacamo.jar:$CLASSPATH:. \
   jason.mas2j.parser.mas2j $1 $2
 
 #chmod u+x *.sh

Modified: trunk/demos/distributed-jade/case2/myAllocator.java
===================================================================
--- trunk/demos/distributed-jade/case2/myAllocator.java	2013-12-10 12:14:10 UTC (rev 1765)
+++ trunk/demos/distributed-jade/case2/myAllocator.java	2013-12-10 17:53:48 UTC (rev 1766)
@@ -39,9 +39,10 @@
         }
         
         int agsByContainer = nbAgs / containers.size();
-        
+        System.out.println(agsByContainer+" agents will run in each container.");
+		
         // create allocation
-        int i=1;
+        int i=0;
         for (AgentParameters ap : project.getAgents()) {
             String agName = ap.name;
             for (int cAg = 0; cAg < ap.qty; cAg++) {
@@ -49,7 +50,9 @@
                 if (ap.qty > 1) {
                     numberedAg += (cAg + 1);
                 }
-                allocation.put(numberedAg, containers.get( i % agsByContainer));
+				String c = containers.get( i % containers.size());
+				System.out.println("  - agent "+numberedAg+" will run at "+c);
+                allocation.put(numberedAg, c);
                 i++;
             }
         }

Modified: trunk/lib/moise.jar
===================================================================
(Binary files differ)

Modified: trunk/src/jason/infra/jade/JadeMASLauncherAnt.java
===================================================================
--- trunk/src/jason/infra/jade/JadeMASLauncherAnt.java	2013-12-10 12:14:10 UTC (rev 1765)
+++ trunk/src/jason/infra/jade/JadeMASLauncherAnt.java	2013-12-10 17:53:48 UTC (rev 1766)
@@ -41,6 +41,7 @@
                     out.write(line+"\n");
                 }
                 out.close();
+                in.close();
             } else {
                 sFile.delete();
                 if (Config.get().getBoolean(Config.JADE_SNIFFER)) {
@@ -160,7 +161,7 @@
                     String numberedAg = ap.getAgName();
                     if (ap.qty > 1)
                         numberedAg += (cAg + 1);
-                    if ( (container.equals("Main-Container") && ap.getHost() == null) ||
+                    if ( (container.equals("Main-Container") && ap.getHost() == null && allocator == null) ||
                          (ap.getHost() != null && ap.getHost().equals(container)) || 
                          (allocator != null && allocator.allocateAgent(numberedAg) != null && allocator.allocateAgent(numberedAg).equals(container))) {                        
                         agents.append(sep+numberedAg+":"+JadeAgArch.class.getName()+"(j-project,"+project.getProjectFile().getName()+","+ap.getAgName()+")");

Modified: trunk/src/jason/jeditplugin/Config.java
===================================================================
--- trunk/src/jason/jeditplugin/Config.java	2013-12-10 12:14:10 UTC (rev 1765)
+++ trunk/src/jason/jeditplugin/Config.java	2013-12-10 17:53:48 UTC (rev 1766)
@@ -216,7 +216,7 @@
         tryToFixJarFileConf(JASON_JAR,  "jason.jar",  700000);
         tryToFixJarFileConf(JADE_JAR,   "jade.jar",  2000000);
         tryToFixJarFileConf(MOISE_JAR,  "moise.jar",  300000);
-        tryToFixJarFileConf(JACAMO_JAR, "jacamo.jar",  10000);
+        tryToFixJarFileConf(JACAMO_JAR, "jacamo.jar",   5000);
 
         // fix java home
         if (get(JAVA_HOME) == null || !checkJavaHomePath(getProperty(JAVA_HOME))) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.