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

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

Revision: 1345
          http://jason.svn.sourceforge.net/jason/?rev=1345&view=rev
Author:   jomifred
Date:     2008-06-26 08:02:50 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
add a new setupLogger in RunCentMAS

Modified Paths:
--------------
    trunk/src/jason/asSemantics/Agent.java
    trunk/src/jason/asSyntax/UnnamedVar.java
    trunk/src/jason/functions/Random.java
    trunk/src/jason/infra/centralised/RunCentralisedMAS.java
    trunk/src/jason/stdlib/nth.java

Modified: trunk/src/jason/asSemantics/Agent.java
===================================================================
--- trunk/src/jason/asSemantics/Agent.java	2008-06-24 16:19:11 UTC (rev 1344)
+++ trunk/src/jason/asSemantics/Agent.java	2008-06-26 15:02:50 UTC (rev 1345)
@@ -146,15 +146,22 @@
     	            }
                 }
             }
-                
-            // kqml Plans at the end of the ag PS
-            setASLSrc("kqmlPlans.asl");
-            parseAS(JasonException.class.getResource("/asl/kqmlPlans.asl"));
-            setASLSrc(asSrc);
+
             if (parsingOk) {
                 addInitialBelsInBB();
                 addInitialGoalsInTS();
             }
+
+            // kqml Plans at the end of the ag PS
+            if (JasonException.class.getResource("/asl/kqmlPlans.asl") != null) { 
+                setASLSrc("kqmlPlans.asl");
+                parseAS(JasonException.class.getResource("/asl/kqmlPlans.asl"));
+                setASLSrc(asSrc);
+            } else {
+                logger.warning("The kqmlPlans.asl was not found!");
+            }
+            
+
             return ts;
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Error creating the agent class!", e);

Modified: trunk/src/jason/asSyntax/UnnamedVar.java
===================================================================
--- trunk/src/jason/asSyntax/UnnamedVar.java	2008-06-24 16:19:11 UTC (rev 1344)
+++ trunk/src/jason/asSyntax/UnnamedVar.java	2008-06-26 15:02:50 UTC (rev 1345)
@@ -42,7 +42,7 @@
 
     public UnnamedVar(String name) {
         super( name.length() == 1 ? "_" + (varCont++) : name);
-        myId = varCont;
+        myId = varCont++;
     }
 
     public UnnamedVar(int id) {

Modified: trunk/src/jason/functions/Random.java
===================================================================
--- trunk/src/jason/functions/Random.java	2008-06-24 16:19:11 UTC (rev 1344)
+++ trunk/src/jason/functions/Random.java	2008-06-26 15:02:50 UTC (rev 1345)
@@ -12,7 +12,7 @@
   
    <p>Examples:<ul>
    <li> <code>math.random</code>: returns the random number between 0 and 1.</li>
-   <li> <code>math.random(10)</code>: returns the random number between 0 and 10.</li>
+   <li> <code>math.random(10)</code>: returns the random number between 0 and 9.9999.</li>
    </ul>
    
    @author Jomi

Modified: trunk/src/jason/infra/centralised/RunCentralisedMAS.java
===================================================================
--- trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2008-06-24 16:19:11 UTC (rev 1344)
+++ trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2008-06-26 15:02:50 UTC (rev 1345)
@@ -52,6 +52,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
@@ -212,10 +213,22 @@
 	                LogManager.getLogManager().readConfiguration(RunCentralisedMAS.class.getResource("/templates/" + logPropFile).openStream());
 	            } catch (Exception e) {
 	                System.err.println("Error setting up logger:" + e);
+	                e.printStackTrace();
 	            }
 	        }
     	}
     }
+    
+    public static void setupDefaultConsoleLogger() {
+        Handler[] hs = Logger.getLogger("").getHandlers(); 
+        for (int i = 0; i < hs.length; i++) { 
+            Logger.getLogger("").removeHandler(hs[i]); 
+        }
+        Handler h = new ConsoleHandler();
+        h.setFormatter(new MASConsoleLogFormatter()); 
+        Logger.getLogger("").addHandler(h);
+        Logger.getLogger("").setLevel(Level.INFO);        
+    }
 
     protected void createButtons() {
         createStopButton();

Modified: trunk/src/jason/stdlib/nth.java
===================================================================
--- trunk/src/jason/stdlib/nth.java	2008-06-24 16:19:11 UTC (rev 1344)
+++ trunk/src/jason/stdlib/nth.java	2008-06-26 15:02:50 UTC (rev 1345)
@@ -51,12 +51,12 @@
     public Object execute(TransitionSystem ts, Unifier un, Term[] args) throws Exception {
     	try {
 	        if (!args[0].isNumeric()) {
-	            throw new JasonException("nth: the first argument should be numeric!");
+	            throw new JasonException("nth: the first argument should be numeric and not '"+args[0]+"'.");
 	        }
 	        int index = (int)((NumberTerm)args[0]).solve();
 	
 	        if (!args[1].isList()) {
-	            throw new JasonException("nth: the second argument should be a list!");
+	            throw new JasonException("nth: the second argument should be a list and not '"+args[1]+"'.");
 	        }
 	        ListTerm list = (ListTerm)args[1];
 	


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