Merge pull request #7 from iss2022-BCR/sprint1

Sprint1 quasi concluso

Author: mikyll

.gitignore

@@ -22,6 +22,85 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+#IntelliJ
+.DS_Store
+.idea/shelf
+/confluence/target
+/dependencies/repo
+/android.tests.dependencies
+/dependencies/android.tests.dependencies
+/dist
+/local
+/gh-pages
+/ideaSDK
+/clionSDK
+/android-studio/sdk
+out/
+/tmp
+/intellij
+workspace.xml
+*.versionsBackup
+/idea/testData/debugger/tinyApp/classes*
+/jps-plugin/testData/kannotator
+/js/js.translator/testData/out/
+/js/js.translator/testData/out-min/
+/js/js.translator/testData/out-pir/
+.gradle/
+build/
+!**/src/**/build
+!**/test/**/build
+*.iml
+!**/testData/**/*.iml
+.idea/remote-targets.xml
+.idea/libraries/Gradle*.xml
+.idea/libraries/Maven*.xml
+.idea/artifacts/PILL_*.xml
+.idea/artifacts/KotlinPlugin.xml
+.idea/modules
+.idea/runConfigurations/JPS_*.xml
+.idea/runConfigurations/PILL_*.xml
+.idea/runConfigurations/_FP_*.xml
+.idea/runConfigurations/_MT_*.xml
+.idea/libraries
+.idea/modules.xml
+.idea/gradle.xml
+.idea/compiler.xml
+.idea/inspectionProfiles/profiles_settings.xml
+.idea/.name
+.idea/artifacts/dist_auto_*
+.idea/artifacts/dist.xml
+.idea/artifacts/ideaPlugin.xml
+.idea/artifacts/kotlinc.xml
+.idea/artifacts/kotlin_compiler_jar.xml
+.idea/artifacts/kotlin_plugin_jar.xml
+.idea/artifacts/kotlin_jps_plugin_jar.xml
+.idea/artifacts/kotlin_daemon_client_jar.xml
+.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
+.idea/artifacts/kotlin_main_kts_jar.xml
+.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
+.idea/artifacts/kotlin_reflect_jar.xml
+.idea/artifacts/kotlin_stdlib_js_ir_*
+.idea/artifacts/kotlin_test_js_ir_*
+.idea/artifacts/kotlin_stdlib_wasm_*
+.idea/artifacts/kotlinx_atomicfu_runtime_*
+.idea/artifacts/kotlinx_cli_jvm_*
+.idea/jarRepositories.xml
+.idea/csv-plugin.xml
+.idea/libraries-with-intellij-classes.xml
+.idea/misc.xml
+.idea/protoeditor.xml
+node_modules/
+.rpt2_cache/
+libraries/tools/kotlin-test-js-runner/lib/
+local.properties
+buildSrcTmp/
+distTmp/
+outTmp/
+/test.output
+/kotlin-native/dist
+kotlin-ide/
+
 #tmp
 Sprint2*/
-Sprint3*/
+Sprint3*/
+

README.md

@@ -10,7 +10,7 @@
 </div>
 
 <div align="center">
-  <img align="center" width="25%" src="./gfx/walle.jpg"/>
+  <img align="center" width="25%" src="commons/resources/imgs/walle.jpg"/>
 
   <h1>WasteService</h1>
 

Sprint0/Sprint0_RequirementAnalysis/.idea/modules/unibo.test_storerequest.test.iml

@@ -0,0 +1,46 @@
+from diagrams import Cluster, Diagram, Edge
+from diagrams.custom import Custom
+import os
+os.environ['PATH'] += os.pathsep + 'C:/Program Files/Graphviz/bin/'
+
+graphattr = {     #https://www.graphviz.org/doc/info/attrs.html
+    'fontsize': '22',
+}
+
+nodeattr = {   
+    'fontsize': '22',
+    'bgcolor': 'lightyellow'
+}
+
+eventedgeattr = {
+    'color': 'red',
+    'style': 'dotted'
+}
+with Diagram('demoArch', show=False, outformat='png', graph_attr=graphattr) as diag:
+  with Cluster('env'):
+     sys = Custom('','./qakicons/system.png')
+     with Cluster('ctx_wasteservice', graph_attr=nodeattr):
+          wasteservice=Custom('wasteservice','./qakicons/symActorSmall.png')
+          transporttrolley=Custom('transporttrolley','./qakicons/symActorSmall.png')
+     with Cluster('ctx_monitor', graph_attr=nodeattr):
+          wasteservicestatusgui=Custom('wasteservicestatusgui','./qakicons/symActorSmall.png')
+     with Cluster('ctx_raspdevice', graph_attr=nodeattr):
+          alarmdevice=Custom('alarmdevice','./qakicons/symActorSmall.png')
+          warningdevice=Custom('warningdevice','./qakicons/symActorSmall.png')
+     with Cluster('ctx_smartdevice_test', graph_attr=nodeattr):
+          smartdevice_test=Custom('smartdevice_test','./qakicons/symActorSmall.png')
+     with Cluster('ctx_basicrobot', graph_attr=nodeattr):
+          basicrobot=Custom('basicrobot(ext)','./qakicons/externalQActor.png')
+     smartdevice_test >> Edge(color='magenta', style='solid', xlabel='storerequest') >> wasteservice
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadaccepted') >> sys 
+     wasteservice >> Edge(color='blue', style='solid', xlabel='doDeposit') >> transporttrolley
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
+     wasteservice >> Edge(color='blue', style='solid', xlabel='updategui') >> wasteservicestatusgui
+     wasteservice >> Edge(color='blue', style='solid', xlabel='stop') >> transporttrolley
+     wasteservice >> Edge(color='blue', style='solid', xlabel='resume') >> transporttrolley
+     transporttrolley >> Edge(color='blue', style='solid', xlabel='updateled') >> warningdevice
+     transporttrolley >> Edge(color='blue', style='solid', xlabel='updategui') >> wasteservicestatusgui
+     transporttrolley >> Edge(color='magenta', style='solid', xlabel='step') >> basicrobot
+     transporttrolley >> Edge(color='blue', style='solid', xlabel='cmd') >> basicrobot
+     alarmdevice >> Edge(color='blue', style='solid', xlabel='distance') >> wasteservice
+diag

Sprint0/Sprint0_RequirementAnalysis/Arch_demo.py

@@ -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 {

Sprint0/Sprint0_RequirementAnalysis/build2022.gradle

@@ -0,0 +1,15 @@
+%====================================================================================
+% demo description   
+%====================================================================================
+context(ctx_wasteservice, "localhost",  "TCP", "11800").
+context(ctx_monitor, "localhost",  "TCP", "11801").
+context(ctx_raspdevice, "localhost",  "TCP", "11802").
+context(ctx_smartdevice_test, "localhost",  "TCP", "11803").
+context(ctx_basicrobot, "localhost",  "TCP", "11810").
+ qactor( basicrobot, ctx_basicrobot, "external").
+  qactor( smartdevice_test, ctx_smartdevice_test, "it.unibo.smartdevice_test.Smartdevice_test").
+  qactor( wasteservice, ctx_wasteservice, "it.unibo.wasteservice.Wasteservice").
+  qactor( transporttrolley, ctx_wasteservice, "it.unibo.transporttrolley.Transporttrolley").
+  qactor( alarmdevice, ctx_raspdevice, "it.unibo.alarmdevice.Alarmdevice").
+  qactor( warningdevice, ctx_raspdevice, "it.unibo.warningdevice.Warningdevice").
+  qactor( wasteservicestatusgui, ctx_monitor, "it.unibo.wasteservicestatusgui.Wasteservicestatusgui").

Sprint0/Sprint0_RequirementAnalysis/demo.pl

@@ -1 +1 @@
-rootProject.name = "unibo.demo_system_overview_v0"
+rootProject.name = "unibo.test_storerequest"

Sprint0/Sprint0_RequirementAnalysis/settings.gradle

@@ -6,7 +6,7 @@ import kotlinx.coroutines.runBlocking
 
 fun main() = runBlocking {
 	QakContext.createContexts(
-	        "localhost", this, "demo_system_overview_v0.pl", "sysRules.pl","ctx_basicrobot"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_basicrobot"
 	)
 }
 

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, "demo_system_overview_v0.pl", "sysRules.pl","ctx_monitor"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_monitor"
 	)
 }
 

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, "demo_system_overview_v0.pl", "sysRules.pl","ctx_raspdevice"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_raspdevice"
 	)
 }
 

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, "demo_system_overview_v0.pl", "sysRules.pl","ctx_smartdevice_test"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_smartdevice_test"
 	)
 }
 

Sprint0/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, "demo_system_overview_v0.pl", "sysRules.pl","ctx_wasteservice"
+	        "localhost", this, "demo.pl", "sysRules.pl","ctx_wasteservice"
 	)
 }
 

Sprint0/Sprint0_RequirementAnalysis/src/it/unibo/ctx_wasteservice/MainCtx_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