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

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

Revision: 1904
          http://sourceforge.net/p/jason/svn/1904
Author:   jomifred
Date:     2016-04-13 22:22:03 +0000 (Wed, 13 Apr 2016)
Log Message:
-----------
call sleep in archs (instead of in TS)

Modified Paths:
--------------
    trunk/demos/using-only-jason-BDI-engine/SimpleJasonAgent.java
    trunk/src/jason/architecture/AgArch.java
    trunk/src/jason/architecture/AgArchInfraTier.java
    trunk/src/jason/infra/centralised/RunCentralisedMAS.java
    trunk/src/jason/infra/jade/JadeAgArch.java
    trunk/src/jason/infra/jade/JasonBridgeArch.java

Modified: trunk/demos/using-only-jason-BDI-engine/SimpleJasonAgent.java
===================================================================
--- trunk/demos/using-only-jason-BDI-engine/SimpleJasonAgent.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/demos/using-only-jason-BDI-engine/SimpleJasonAgent.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -44,6 +44,8 @@
                 // calls the Jason engine to perform one reasoning cycle
                 logger.fine("Reasoning....");
                 getTS().reasoningCycle();
+                if (getTS().canSleep())
+                    sleep();
             }
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Run error", e);
@@ -82,10 +84,9 @@
     }
 
     // a very simple implementation of sleep
-    @Override
     public void sleep() {
         try {
-        Thread.sleep(1000);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {}
     }
     

Modified: trunk/src/jason/architecture/AgArch.java
===================================================================
--- trunk/src/jason/architecture/AgArch.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/src/jason/architecture/AgArch.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -207,10 +207,10 @@
     }
 
     /** Puts the agent in sleep. */
-    public void sleep() {
+    /*public void sleep() {
         if (successor != null)
             successor.sleep();
-    }
+    }*/
     
     public void wake() {
         if (successor != null)

Modified: trunk/src/jason/architecture/AgArchInfraTier.java
===================================================================
--- trunk/src/jason/architecture/AgArchInfraTier.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/src/jason/architecture/AgArchInfraTier.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -67,7 +67,7 @@
     //public void stopAg();
     
     /** Put the agent in "sleep" mode */
-    public void sleep();
+    //public void sleep();
     
     /** Removes the agent from the "sleep" mode */
     public void wake();

Modified: trunk/src/jason/infra/centralised/RunCentralisedMAS.java
===================================================================
--- trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/src/jason/infra/centralised/RunCentralisedMAS.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -837,7 +837,13 @@
                     if (project.getInfrastructure().getParametersArray().length > 3) {
             			cyclesSense = Integer.parseInt(project.getInfrastructure().getParameter(2));
             			cyclesDeliberate = Integer.parseInt(project.getInfrastructure().getParameter(3));
-            			cyclesAct = Integer.parseInt(project.getInfrastructure().getParameter(4));                    
+            			cyclesAct = Integer.parseInt(project.getInfrastructure().getParameter(4));
+            			if (project.getInfrastructure().getParametersArray().length > 4) {
+            			    cycles = Integer.parseInt(project.getInfrastructure().getParameter(5));
+            			} else {
+            			    cycles = 5;
+            			    
+            			}            			    
                     } else if (project.getInfrastructure().getParametersArray().length > 2) {
             			cycles = Integer.parseInt(project.getInfrastructure().getParameter(2));
             		} else {

Modified: trunk/src/jason/infra/jade/JadeAgArch.java
===================================================================
--- trunk/src/jason/infra/jade/JadeAgArch.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/src/jason/infra/jade/JadeAgArch.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -43,7 +43,7 @@
    
     protected JasonBridgeArch jasonBridgeAgArch;
 
-    private boolean enterInSleepMode = false;
+    //private boolean enterInSleepMode = false;
 
     AID controllerAID  = new AID(RunJadeMAS.controllerName, AID.ISLOCALNAME);
 
@@ -89,9 +89,10 @@
     }
     */
     
-    void enterInSleepMode() {
+    /*void enterInSleepMode() {
         enterInSleepMode = true;        
-    }
+    }*/
+    
     void wakeUp() {
         tsBehaviour.restart();
     }
@@ -223,9 +224,9 @@
                     block(1000);
                 }
             } else {
-                if (enterInSleepMode) {
+                if (ts.canSleep()) {
                     block(1000);
-                    enterInSleepMode = false;
+                    //enterInSleepMode = false;
                 } else {
                     ts.reasoningCycle();
                 }

Modified: trunk/src/jason/infra/jade/JasonBridgeArch.java
===================================================================
--- trunk/src/jason/infra/jade/JasonBridgeArch.java	2016-04-13 21:12:58 UTC (rev 1903)
+++ trunk/src/jason/infra/jade/JasonBridgeArch.java	2016-04-13 22:22:03 UTC (rev 1904)
@@ -47,11 +47,11 @@
             logger.setLevel(getTS().getSettings().logLevel());
     }
             
-    @Override
+    /*@Override
     public void sleep() {
         jadeAg.enterInSleepMode();
         //tsBehaviour.block(1000);
-    }
+    }*/
     
     @Override
     public void wake() {

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