update

+ deployment (simulated) + clean/fix
iss2022-BCR · May 29, 2023 · 9fa753f · 9fa753f
1 parent 324f2f6
commit 9fa753f
Show file tree

Hide file tree

Showing 192 changed files with 4,985 additions and 3,379 deletions.
diff --git a/Sprint0/Sprint0_RequirementAnalysis/Api_demo.txt b/Sprint0/Sprint0_RequirementAnalysis/Api_demo.txt
diff --git a/Sprint0/Sprint0_RequirementAnalysis/Api_sprint0_system_overview.txt b/Sprint0/Sprint0_RequirementAnalysis/Api_sprint0_system_overview.txt
diff --git a/Sprint0/Sprint0_RequirementAnalysis/Api_test_storerequest.txt b/Sprint0/Sprint0_RequirementAnalysis/Api_test_storerequest.txt
diff --git a/Sprint0/Sprint0_RequirementAnalysis/build2022.gradle b/Sprint0/Sprint0_RequirementAnalysis/build2022.gradle
@@ -105,7 +105,7 @@ eclipse {
 
 application {
     // Define the main class for the application.
-    mainClass = 'it.unibo.ctx_basicrobot.MainCtx_basicrobotKt'
+    mainClass = 'it.unibo.ctx_test_storerequest.MainCtx_test_storerequestKt'
 }
 
  jar {

diff --git a/Sprint0/Sprint0_RequirementAnalysis/settings.gradle b/Sprint0/Sprint0_RequirementAnalysis/settings.gradle
@@ -1 +1 @@
-rootProject.name = "unibo.sprint0_system_overview"
+rootProject.name = "unibo.test_storerequest"
diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_basicrobot/MainCtx_basicrobot.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_basicrobot/MainCtx_basicrobot.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_system_overview.pl", "sysRules.pl","ctx_basicrobot"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_basicrobot"
 	)
 }
 
diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_monitor/MainCtx_monitor.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_monitor/MainCtx_monitor.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_system_overview.pl", "sysRules.pl","ctx_monitor"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_monitor"
 	)
 }
 
diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_raspdevice/MainCtx_raspdevice.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_raspdevice/MainCtx_raspdevice.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_system_overview.pl", "sysRules.pl","ctx_raspdevice"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_raspdevice"
 	)
 }
 
diff --git a/...Sprint0_RequirementAnalysis/src/it/unibo/ctx_smartdevice_test/MainCtx_smartdevice_test.kt b/...Sprint0_RequirementAnalysis/src/it/unibo/ctx_smartdevice_test/MainCtx_smartdevice_test.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_system_overview.pl", "sysRules.pl","ctx_smartdevice_test"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_smartdevice_test"
 	)
 }
 
diff --git a/...rint0_RequirementAnalysis/src/it/unibo/ctx_test_storerequest/MainCtx_test_storerequest.kt b/...rint0_RequirementAnalysis/src/it/unibo/ctx_test_storerequest/MainCtx_test_storerequest.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_test_storerequest.pl", "sysRules.pl","ctx_test_storerequest"
+	        "localhost", this, "test_storerequest.pl", "sysRules.pl","ctx_test_storerequest"
 	)
 }
 
diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_wasteservice/MainCtx_wasteservice.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_wasteservice/MainCtx_wasteservice.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "sprint0_system_overview.pl", "sysRules.pl","ctx_wasteservice"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_wasteservice"
 	)
 }
 
diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/test_wasteservice/Test_wasteservice.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/test_wasteservice/Test_wasteservice.kt
@@ -23,6 +23,13 @@ class Test_wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm
 		return { //this:ActionBasciFsm
 				state("state_init") { //this:State
 					action { //it:State
+
+									var CurrentPlastic = 0.0f
+									var CurrentGlass = 0.0f
+						println("$name in ${currentState.stateName} | $currentMsg")
+						println("[WasteService] Reset:")
+						println("	Plastic: $CurrentPlastic")
+						println("	Glass: $CurrentGlass")
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002
@@ -32,43 +39,36 @@ class Test_wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm
 				}	 
 				state("state_idle") { //this:State
 					action { //it:State
-						println("[Test_WasteService] Waiting for messages...")
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002
 					sysaction { //it:State
 					}	 	 
-					 transition(edgeName="t10",targetState="state_handle_store",cond=whenRequest("storerequest"))
+					 transition(edgeName="t00",targetState="state_handle_store",cond=whenRequest("storerequest"))
 				}	 
 				state("state_handle_store") { //this:State
 					action { //it:State
+						println("	dioporco")
 						println("$name in ${currentState.stateName} | $currentMsg")
 						if( checkMsgContent( Term.createTerm("storerequest(TYPE,TRUCKLOAD)"), Term.createTerm("storerequest(TYPE,TRUCKLOAD)"), 
 						                        currentMsg.msgContent()) ) { //set msgArgList
+								println("	dioporco2")
 
 												Type = wasteservice.WasteType.valueOf(payloadArg(0))
 												TruckLoad = payloadArg(1).toFloat()
 								if( 
 													// enough space
 													(Type == wasteservice.WasteType.PLASTIC && CurrentPlastic + TruckLoad <= wasteservice.Constants.MAXPB) ||
 													(Type == wasteservice.WasteType.GLASS && CurrentGlass + TruckLoad <= wasteservice.Constants.MAXGB)
-								 ){
-													if (Type == wasteservice.WasteType.PLASTIC) {
-														CurrentPlastic += TruckLoad 
-													}
-													else {
-														CurrentGlass += TruckLoad
-													}
-								println("[Test_WasteService] Load accepted ($TruckLoad KG of $Type).")
+								 ){println("	OK")
 								answer("storerequest", "loadaccepted", "loadaccepted(_)"   )  
 								}
 								else
-								 {println("[Test_WasteService] Load rejected")
+								 {println("	NO")
 								 answer("storerequest", "loadrejected", "loadaccepted(_)"   )  
 								 }
-								println("[Test_WasteService] State:")
-								println("	Plastic: ${CurrentPlastic}/ ${wasteservice.Constants.MAXPB} KG, Glass: ${CurrentGlass} / ${wasteservice.Constants.MAXPB} KG")
 						}
+						delay(1000) 
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002

diff --git a/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/wasteservice/Wasteservice.kt b/Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/wasteservice/Wasteservice.kt
@@ -28,8 +28,8 @@ class Wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm( nam
 									var CurrentGlass = 0.0f
 						println("$name in ${currentState.stateName} | $currentMsg")
 						println("[WasteService] Reset:")
-						println("	Plastic: $CurrentPlastic / ${wasteservice.Constants.MAXPB} KG")
-						println("	Glass: $CurrentGlass / ${wasteservice.Constants.MAXGB} KG")
+						println("	Plastic: $CurrentPlastic")
+						println("	Glass: $CurrentGlass")
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002
@@ -39,7 +39,6 @@ class Wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm( nam
 				}	 
 				state("state_idle") { //this:State
 					action { //it:State
-						println("[WasteService] Idle...")
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002
@@ -60,24 +59,15 @@ class Wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm( nam
 													// enough space
 													(Type == wasteservice.WasteType.PLASTIC && CurrentPlastic + TruckLoad <= wasteservice.Constants.MAXPB) ||
 													(Type == wasteservice.WasteType.GLASS && CurrentGlass + TruckLoad <= wasteservice.Constants.MAXGB)
-								 ){
-												if (Type == wasteservice.WasteType.PLASTIC) {
-													CurrentPlastic += TruckLoad 
-												}
-												else {
-													CurrentGlass += TruckLoad
-												}
-								answer("storerequest", "loadaccepted", "loadaccepted(_)"   )  
+								 ){answer("storerequest", "loadaccepted", "loadaccepted(_)"   )  
 								forward("doDeposit", "doDeposit(TYPE,WEIGHT)" ,"transporttrolley" ) 
-								delay(1000) 
 								}
 								else
 								 {answer("storerequest", "loadrejected", "loadaccepted(_)"   )  
 								 }
 								forward("updategui", "updategui(_)" ,"wasteservicestatusgui" ) 
-								println("	Plastic: $CurrentPlastic / ${wasteservice.Constants.MAXPB} KG")
-								println("	Glass: $CurrentGlass / ${wasteservice.Constants.MAXGB} KG")
 						}
+						delay(1000) 
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002
@@ -87,15 +77,12 @@ class Wasteservice ( name: String, scope: CoroutineScope  ) : ActorBasicFsm( nam
 				}	 
 				state("state_handle_distance") { //this:State
 					action { //it:State
-						if( checkMsgContent( Term.createTerm("distance(V)"), Term.createTerm("distance(V)"), 
-						                        currentMsg.msgContent()) ) { //set msgArgList
-								if(  payloadArg(0).toFloat() >= wasteservice.Constants.DLIMT  
-								 ){forward("stop", "stop(_)" ,"transporttrolley" ) 
-								}
-								else
-								 {forward("resume", "resume(_)" ,"transporttrolley" ) 
-								 }
+						if(  payloadArg(0).toFloat() >= wasteservice.Constants.DLIMT  
+						 ){forward("stop", "stop(_)" ,"transporttrolley" ) 
 						}
+						else
+						 {forward("resume", "resume(_)" ,"transporttrolley" ) 
+						 }
 						//genTimer( actor, state )
 					}
 					//After Lenzi Aug2002