Merge pull request #19 from AAAI-DISIM-UnivAQ/dev

tested

Author: giodegas

Examples/Double_Events.txt

@@ -0,0 +1,42 @@
+
+Double Events Example
+=============
+
+
+The example shows that it is possible to have conjunctions of external events 
+in the antecedents of the DALI reactive rule. 
+If you want to enter more than one external event, you must enter the Simultaneity 
+Interval before the reactive rule is defined.
+The result of the reactive rule will only be executed if all external events 
+arrive in the simultaneity interval.
+
+In the advanced example, the files contained in the mas/types folder have been modified:
+=============
+
+agentType1.txt
+
+alarm1E:>write('Activate fire suppression and Send security guard '),nl.
+
+=============
+
+agentType2.txt
+
+alarmE:>write('Call fire department'),nl.
+
+=============
+
+agentType3.txt
+
+:-dynamic notified/1.
+notified(false).
+t60.
+heat_sensedE(X,T),smoke_detectedE(X,T):>fire_responceA(X,T).
+check_fire(X,T):-fire_responceP(X,T).
+check_fireI(X,T):>choose_fire(X,T).
+choose_fire(X,T):-notified(false),T<11,activate_fire_suppressionA,send_security_guardA,retract(notified(false)).
+choose_fire(X,T):-notified(false),T>10,call_fire_departmentA,retract(notified(false)).
+alarm1(X,T):-activate_fire_suppressionP,send_security_guardP.
+alarm1I(X,T):>messageA(agent1,send_message(alarm1,agent3),agent3),nl.
+alarm2(X,T):-call_fire_departmentP.
+alarm2I(X,T):>messageA(agent2,send_message(alarm,agent3),agent3),nl.
+send_security_guard(X,T):< security_guard_available(X,T).

Examples/advanced/build/null

@@ -2,4 +2,4 @@
 
 eventE:> write('which event?').
 
-goE:> write('received.'), messageA(agent2,send_message(go,agent1)).
+goE:> write('received.'), messageA(agent2,send_message(go, Me)).

Examples/advanced/conf/mas/null

@@ -1 +1 @@
-'mbp-g.local':3010.
+'asus-gdg':3010.

Examples/advanced/mas/types/agentType1.txt

@@ -2,49 +2,49 @@
 #exec 1>/dev/null # @echo off
 clear # cls
 #title "MAS"
-sicstus_home=/usr/local/sicstus4.3.5
-#sicstus_home=/usr/local/sicstus4.2.3
-main_home=../..
-dali_home=../../src
-conf_dir=conf
-prolog="$sicstus_home/bin/sicstus"
+SICSTUS_HOME=/usr/local/sicstus4.4.1
+MAIN_HOME=../..
+DALI_HOME=../../src
+CONF_DIR=conf
+PROLOG="$SICSTUS_HOME/bin/sicstus"
 WAIT="ping -c 4 127.0.0.1"
-instances_home=mas/instances
-types_home=mas/types
-build_home=build
+INSTANCES_HOME=mas/instances
+TYPES_HOME=mas/types
+BUILD_HOME=build
+XTERM=xterm
 
 rm -rf tmp/*
 rm -rf build/*
 rm -f work/* # remove everything if you want to clear agent history
 rm -rf conf/mas/*
 
 # Build agents by creating a file with the instance name containing the type content for each instance.
-for instance_filename in $instances_home/*.txt
+for instance_filename in $INSTANCES_HOME/*.txt
 do
 	type=$(<$instance_filename) # agent type name is the content of the instance file
-	type_filename="$types_home/$type.txt"
+	type_filename="$TYPES_HOME/$type.txt"
 	instance_base="${instance_filename##*/}" # e.g. 'mas/instances/agent1.txt' -> 'agent1.txt'
 	echo $type_filename
-	cat $type_filename >> "$build_home/$instance_base"
+	cat $type_filename >> "$BUILD_HOME/$instance_base"
 done
 
-cp $build_home/*.txt work
+cp $BUILD_HOME/*.txt work
 
-xterm -hold -e "$prolog -l $dali_home/active_server_wi.pl --goal \"go(3010,'server.txt').\"" & #start /B "" "%prolog%" -l "%dali_home%/active_server_wi.pl" --goal go(3010,'%daliH%/server.txt').
+$XTERM -hold -e "$PROLOG -l $DALI_HOME/active_server_wi.pl --goal \"go(3010,'server.txt').\"" & #start /B "" "%PROLOG%" -l "%DALI_HOME%/active_server_wi.pl" --goal go(3010,'%daliH%/server.txt').
 echo Server ready. Starting the MAS....
 $WAIT > /dev/null # %WAIT% >nul
 
-xterm -hold -e "$prolog -l $dali_home/active_user_wi.pl --goal utente." & # start /B "" "%prolog%" -l "%dali_home%/active_user_wi.pl" --goal utente.
+$XTERM -hold -e "$PROLOG -l $DALI_HOME/active_user_wi.pl --goal utente." & # start /B "" "%PROLOG%" -l "%DALI_HOME%/active_user_wi.pl" --goal utente.
 echo Launching agents instances...
 $WAIT > /dev/null # %WAIT% > nul
 
 # Launch agents
-for agent_filename in $build_home/*
+for agent_filename in $BUILD_HOME/*
 do
 	agent_base="${agent_filename##*/}"
     echo "Agente: $agent_base"
-    xterm -e "./conf/makeconf.sh $agent_base $dali_home" &
-    xterm -T "$agent_base" -hold -e "./conf/startagent.sh $agent_base $prolog $dali_home" &
+    $XTERM -e "./conf/makeconf.sh $agent_base $DALI_HOME" &
+    $XTERM -T "$agent_base" -hold -e "./conf/startagent.sh $agent_base $PROLOG $DALI_HOME" &
     sleep 2s
     $WAIT > /dev/null # %WAIT% >nul
 done

Examples/advanced/server.txt

@@ -1,5 +1,5 @@
-:- write('Hello world!').
-
-eventE:> write('which event?').
-
-goE:> write('received.'), messageA(agent2,send_message(go,agent1)).
+:- write('Hello world!').
+
+eventE:> write('which event?').
+
+goE:> write('received.'), messageA(agent2,send_message(go,Me)).