Merge remote-tracking branch 'origin/dev'

Author: cartisan

.classpath

@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -19,7 +20,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/test/asl"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jason"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

.gitignore

@@ -2,4 +2,5 @@ bin
 target
 /launcher.mas2j
 *.csv
-*.log
+*.log
+*.class

lib/choco-solver-4.10.6.jar

@@ -8,6 +8,8 @@ MAS little_red_hen {
 	environment: little_red_hen.FarmEnvironment
 
 	agents:
+		sample_agent;
+		liz;
 		hen test_agent;
 //		hen general_animal[beliefs="is_communal(self)", goals="make_great_again(farm)"];
 //		dog general_animal[beliefs="is_lazy(self)", goals="cazzegiare"];

lib/freehep-graphicsbase-2.4.jar

@@ -21,7 +21,13 @@
 @reject_request_2[atomic, affect(and(mood(dominance,high), personality(agreeableness,negative)))]
 +!obligation(help_with(Helpee, Plan)) : wish(Y) & is_work(help_with(Plan)) <-
 	!reject(Helpee, Plan).
-//    if none of these is true, do help
+//To prevent conscientiousness agents (which should help) from jumping to plan @obligation1 due to lack of annotations, here
+@accept_request_1[affect(personality(conscientiousness,high))]
++!obligation(help_with(Helpee, Plan)) <-		
+	!accept(Helpee, Plan); 
+	!obligation(help_with(Helpee, Plan)).
+//if none of these is true, do help
+@accept_request_2
 +!obligation(help_with(Helpee, Plan)) <-
 	!accept(Helpee, Plan); 
 	!obligation(help_with(Helpee, Plan)).
@@ -55,9 +61,9 @@
 @wish_rem[atomic]
 -wish(Plan) <-
 	.drop_desire(wish(Plan));
-//	.succeed_goal(wish(Plan));
-	.drop_desire(Plan).
-//	.succeed_goal(Plan).
+	.succeed_goal(wish(Plan));
+	.drop_desire(Plan);
+	.succeed_goal(Plan).
 
 // if conscientious do not follow (non-coping) wishes when an obligation is desired --> coping wishes, like !punish, don't fall under this
 @wish1[affect(personality(conscientiousness,high))]

lib/guava-21.0.jar renamed to lib/guava-23.0.jar

@@ -61,6 +61,10 @@ wish(relax).
 	-hungry;
 	-has(Food).
 
+//If we fail to relax once due to too high arousal, stop the wish	
++relax[success(false)] <-	
+	-wish(relax).
+		
 /***** request answer management **********************************************/
 /******************************************************************************/
 
@@ -123,7 +127,7 @@ wish(relax).
 
 // Ask for help if extraverted, unless one feels powerless
 @general_help_acquisition_plan[affect(and(personality(extraversion,positive),not(mood(dominance,low))))]
-+!X[_] : is_work(X) & not complex_plan(X) & not already_asked(X) <-
++!X[_] : is_work(X) & not complex_plan(X) & not already_asked(X) & not X=help_with(_,_) <-
 	.my_name(Me);
 	?present(Agents);
 	+already_asked(X);
@@ -142,11 +146,11 @@ wish(relax).
 	-has(wheat[_]);
 	!create(bread).
 
-+!create(bread) : at(wheat[state(growing)], farm) <-
++!create(bread) : .my_name(Me) & at(wheat[state(growing),owner(Me)], farm) <-
 	!tend(wheat);
 	!create(bread).
 
-+!create(bread) : at(wheat[state(ripe)], farm) <-
++!create(bread) : .my_name(Me) & at(wheat[state(ripe),owner(Me)], farm) <-
 	!harvest(wheat);
 	+has(wheat[state(harvested)]); // TODO: get env to give this information?
 	!create(bread).

lib/jason-o3a-1.0.jar

@@ -0,0 +1,170 @@
+// Agent islandAgent in project inBloom
+
+/******************************************************************************/
+/************ knowledge base  *************************************************/
+/******************************************************************************/
+// Here I can store my knowledge base externally if I want to (or if I have a knowledge base at all)
+// This rn is the farming knowledge base that obviously isn't that important for our agent, but is here for example reasons
+
+{include("agent-knowledge_base.asl")}
+	
+/********************************************/
+/*****     wishes and obligations ***********/
+/********************************************/
+// This is some imported code that helps managing wishes and obligations in a new way
+// The code is project independent, so I also import and use it
+
+{include("agent-desire_wish_management.asl")}
+
+//wish(seeTheWorld).
+//+self(farm_animal) <- +obligation(farm_work).
+
+/******************************************************************************/
+/********** perception management *********************************************/
+/******************************************************************************/
+
+
+
+
+
+/* Initial beliefs and rules */
+
+
+/* Initial goals */
+
+!start.
+
+/* Plans */
+
+@go_on_cruise[affect(personality(openness,high))]
++!start <- goOnCruise.
+
+@go_on_cruise_default
++!start <- stayHome.
+					 
++!happyEnd <- 	happyEnd;
+				-wish(happyEnd).
+				
++!getRescued <- goOnShip;
+				-wish(getRescued).
+
+@rescueSelf0[priority(2)] 
++!rescueSelf <- swimToIsland;
+				-wish(rescueSelf).
+				
+	
+//@heal0[priority(1)] 	
+//+!heal <- if(has(healingPlant)) {
+//			useHealingPlants;
+//			-wish(heal);
+//		} else {
+//			findHealingPlants;
+//		}.
+
+@heal0[priority(1)] 	
++!heal : not(has(healingPlant)) <-
+			findHealingPlants;
+			useHealingPlants;
+			-wish(heal).
+			
+@heal1[priority(1)] 	
++!heal : has(healingPlant) <-
+			useHealingPlants;
+			-wish(heal).
+
+//@food_plan	
+//+!eat <- if(has(food)) {
+//			eat;
+//			-wish(eat);
+//		} else {
+//			getFood;
+//		}.
+		
+@eat0[priority(1)] 
++!eat : not(has(food)) <- 
+		getFood;
+		eat;
+		-wish(eat).
+		
+@eat1[priority(1)] 
++!eat : has(food) <-
+		eat;
+		-wish(eat).
+		  
+//@sleep0[priority(1)] 
+//+!sleep <- if(exists(hut)) {
+//				sleep;
+//				-wish(sleep);
+//				// TODO - only if they wish to heal?
+//				// 1. is it necessary?
+//				// 2. how do I do knowledge abfrage?
+//				// find out object of belief:    ?belief(X)
+//				// find out existence of belief: if(belief)
+//				//-wish(heal);
+//		   } else {
+//		   		buildHut;
+//		   }.
+	
+@sleep0[priority(1)] 	   
++!sleep : not(exists(hut)) <-
+				buildHut;
+				sleep;
+				-wish(sleep).
+		
+@sleep1[priority(1)] 		
++!sleep : exists(hut) <-
+				sleep;
+				-wish(sleep).
+
+
+@extinguish_fire0[priority(2)] 
++!extinguish_fire <- extinguishFire;
+					 -wish(extinguish_fire).
+		  
+//+!complain <- if(has(friend)) {
+//				complain;
+//				-wish(complain);
+//			  } else {
+//				findFriend;
+//			  }.
+			  
++!complain : not(has(friend)) <-
+				findFriend;
+				complain;
+				-wish(complain).
+				
++!complain : has(friend) <-
+				complain;
+				-wish(complain).
+
+
+/* React to new Belifes / Percepts */
+// Name of source is f.e. "percept"
+
++shipWrecked[source(Name)] <- +wish(rescueSelf).
+
++endStory[source(Name)] <- +wish(happyEnd).
+
++rescueEnd[source(Name)] <- +wish(getRescued).
+
++sick[source(Name)] <- +wish(heal).
+
++hungry[source(Name)] <- +wish(eat).
+
++fatigue[source(Name)] <- +wish(sleep).
+
+// not used so far
++stolen(food)[source(Name)] <- +hate(monkey).
+
+// if f.e. friend is eaten, then agent has no friend anymore :(
++eaten(X)[source(Name)] <- -has(X).
+
++homesick[source(Name)] <- +wish(complain).
+
++fire[source(Name)] <- +wish(extinguish_fire).
+
+// TODO why does this not print anything?
++happening[source(Name)] <- .print("A HAPPENING HAPPENED.").
+
+
+// ASL Debug mode -> Run Configurations, duplicate Launcher, add -debug

lib/jfxrt.jar

@@ -2,6 +2,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
@@ -82,6 +83,8 @@ private void initGui() {
 		this.cycleFrame = new JFrame("Plot Cycle");
 		this.cycleFrame.setLayout(new BorderLayout());
 
+		this.logTextArea.setFont(new Font("Menlo", Font.PLAIN, 12));
+
 		// setup text field
 		JScrollPane scroll = new JScrollPane(this.logTextArea);
 		scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
@@ -274,7 +277,7 @@ public void run() {
 
 		while(rr.shouldContinue) {
 			++currentCycle;
-			this.log("Running cycle: " + currentCycle);
+			this.log("\nRunning cycle: " + currentCycle);
 			er = this.engage(rr);
 			this.stories.add(er.getPlotGraph());
 			if (SHOW_FULL_GRAPH){
@@ -297,7 +300,7 @@ protected void finish(EngageResult er) {
 	 * '\n' is appended automatically.
 	 * @param string Message to log
 	 */
-	protected void log(String string) {
+	public void log(String string) {
 		if(this.logTextArea != null) {
 			this.logTextArea.append(string + "\n");
 			this.logTextArea.setCaretPosition(this.logTextArea.getText().length());

little_red_hen.mas2j

@@ -16,19 +16,19 @@ public class ReflectResult {
 	 * Instance of the PlotLauncher for
 	 * the story in question.
 	 */
-	private PlotLauncher<?, ?> runner;
+	protected PlotLauncher<?, ?> runner;
 	/**
 	 * Agents that will be used by the runner 
 	 * to generate characters. Personalities
 	 * should be set appropriately already.
 	 */
-	private List<LauncherAgent> agents;
+	protected List<LauncherAgent> agents;
 	/**
 	 * Instance of PlotModel for the
 	 * next simulation. Will add
 	 * agents automatically.
 	 */
-	private PlotModel<?> model;
+	protected PlotModel<?> model;
 	/**
 	 * If this is false, the cycle will not execute another
 	 * simulation and call finish().

src/asl/agent-desire_wish_management.asl

@@ -49,6 +49,9 @@ public class PlotControlsLauncher extends RunCentralisedMAS implements AnalysisR
 	public void setShowGui(boolean showGui) {
 		this.showGui = showGui;
 	}
+	public boolean getShowGui() {
+		return this.showGui;
+	}
 
 	@Override
 	public synchronized void setupLogger() {
@@ -104,9 +107,9 @@ public synchronized void setupConsoleLogger() {
         Logger.getLogger("").setLevel(LOG_LEVEL);
 	}
 
-	protected void pauseExecution() {
+	public void pauseExecution() {
 	    MASConsoleGUI.get().setPause(true);
-	    if(this.showGui) {
+	    if(this.pauseButton != null) {
 	    	this.pauseButton.setText("Continue");
 	    }
 
@@ -166,12 +169,6 @@ public void resetGraphView() {
 		this.drawButton.setText("Show Graphs");
 	}
 
-	@Override
-	public void finish() {
-		this.pauseExecution();
-		super.finish();
-	}
-
 	@Override
 	protected void createButtons() {
 		this.createPauseButton();