[Jason-developers] SF.net SVN: jason:[1794] trunk/src/jason

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

Revision: 1794
          http://sourceforge.net/p/jason/svn/1794
Author:   jomifred
Date:     2014-08-18 21:37:10 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
other improvements in the API for parsing project files

Modified Paths:
--------------
    trunk/src/jason/infra/centralised/RunCentralisedMAS.java
    trunk/src/jason/mas2j/AgentParameters.java
    trunk/src/jason/mas2j/ClassParameters.java

Modified: trunk/src/jason/infra/centralised/RunCentralisedMAS.java
===================================================================
--- trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2014-08-17 17:54:33 UTC (rev 1793)
+++ trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2014-08-18 21:37:10 UTC (rev 1794)
@@ -376,6 +376,13 @@
                         // cannot add zeros before, it causes many compatibility problems and breaks dynamic creation 
                         // numberedAg += String.format("%0"+String.valueOf(ap.qty).length()+"d", cAg + 1);
                     }
+                    
+                    String nb = "";
+                    int    n  = 1;
+                    while (getAg(numberedAg+nb) != null)
+                        nb = "_" + (n++);
+                    numberedAg += nb;
+                    
                     logger.fine("Creating agent " + numberedAg + " (" + (cAg + 1) + "/" + ap.getNbInstances() + ")");
                     CentralisedAgArch agArch;
                     if (isPool) {
@@ -518,7 +525,7 @@
     }
     
     /** an agent architecture for the infra based on thread pool */
-    private final class CentralisedAgArchForPool extends CentralisedAgArch {
+    protected final class CentralisedAgArchForPool extends CentralisedAgArch {
 
         private volatile boolean runWakeAfterTS = false;
         

Modified: trunk/src/jason/mas2j/AgentParameters.java
===================================================================
--- trunk/src/jason/mas2j/AgentParameters.java	2014-08-17 17:54:33 UTC (rev 1793)
+++ trunk/src/jason/mas2j/AgentParameters.java	2014-08-18 21:37:10 UTC (rev 1794)
@@ -37,6 +37,10 @@
     
     public AgentParameters copy() {
         AgentParameters newap = new AgentParameters();
+        copyTo(newap);
+        return newap;
+    }
+    protected void copyTo(AgentParameters newap) {
         newap.name = this.name;
         newap.asSource = new File(this.asSource.toString());
         newap.agClass = this.agClass.copy();
@@ -46,7 +50,6 @@
             newap.options = new HashMap<String, String>(this.options);
         newap.archClasses = new ArrayList<ClassParameters>(this.archClasses);
         newap.host = this.host;
-        return newap;
     }
     
     public String toString() {
@@ -210,6 +213,7 @@
         if (forceSync || debug) {
             stts.setSync(true);
         }
+        stts.addOption("project-parameter", this); // place of copy of this object anyway
         
         return stts;
     }

Modified: trunk/src/jason/mas2j/ClassParameters.java
===================================================================
--- trunk/src/jason/mas2j/ClassParameters.java	2014-08-17 17:54:33 UTC (rev 1793)
+++ trunk/src/jason/mas2j/ClassParameters.java	2014-08-18 21:37:10 UTC (rev 1794)
@@ -99,8 +99,8 @@
     
     public String toString() {
         StringBuilder out = new StringBuilder(className);
+        out.append("(");
         if (parameters.size() > 0) {
-            out.append("(");
             Iterator<String> i = parameters.iterator();
             while (i.hasNext()) {
                 out.append(i.next());
@@ -108,8 +108,8 @@
                     out.append(",");
                 }
             }
-            out.append(")");
         }
+        out.append(")");
         return out.toString();
     }
 

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