Merge pull request #8 from iss2022-BCR/sprint1

Sprint1 finito

Sprint1/Sprint1_ProblemAnalysis/build2022.gradle

@@ -108,6 +108,14 @@ application {
     mainClass = 'it.unibo.ctx_transporttrolley_test.MainCtx_transporttrolley_testKt'
 }
 
+tasks.withType(Test) {
+    testLogging {
+        exceptionFormat "full"
+        events "started", "skipped", "passed", "failed"
+        showStandardStreams true
+    }
+}
+
  jar {
     println("building jar")
     from sourceSets.main.allSource

Sprint1/Sprint1_Project/scripts/demo_sprint1.bat

@@ -0,0 +1,4 @@
+run_AndroidEmulator.bat
+run_VirtualRobot.bat
+run_WasteService.bat
+run_SmartDevice.bat

Sprint1/Sprint1_Project/scripts/run_AndroidEmulator.bat

@@ -0,0 +1,2 @@
+:: run Android Emulator
+flutter emulators --launch Pixel_3a_API_30_x86

Sprint1/Sprint1_Project/scripts/run_DockerDesktop.bat

@@ -0,0 +1,2 @@
+:: Run Docker Desktop
+start "C:\Program Files\Docker\Docker\Docker Desktop.exe"

Sprint1/Sprint1_Project/scripts/run_SmartDevice.bat

@@ -0,0 +1,31 @@
+@echo off
+
+set ip=%1
+set port=%2
+set waste_type=%3
+set waste_weight=%4
+
+if "%~1" == "" goto default
+if "%~2" == "" goto default
+if "%~3" == "" goto default
+if "%~4" == "" goto default
+
+echo [SmartDevice Demo] Starting demo with the following parameters:
+echo   IP = %ip%
+echo   Port = %port%
+echo   StoreRequest_Type = %waste_type%
+echo   PortStoreRequest_Weight = %waste_weight%
+
+goto end
+
+:default
+cd ../sprint1_smart_device/
+flutter test ./integration_test/smart_device_demo.dart --dart-define="IP=192.168.1.4" --dart-define="PORT=11800" --dart-define="WASTE_TYPE=GLASS" --dart-define="WASTE_WEIGHT=10.0"
+
+:usage
+echo usage: ./demo_sprint1 waste_service_IP waste_service_port waste_type waste_weight
+goto end
+
+:end
+cd ../sprint1_smart_device/
+flutter test ./integration_test/smart_device_demo.dart --dart-define="IP=%ip%" --dart-define="PORT=%port%" --dart-define="WASTE_TYPE=%waste_type%" --dart-define="WASTE_WEIGHT=%waste_weight%"

Sprint1/Sprint1_Project/scripts/run_VirtualRobot.bat

@@ -0,0 +1,7 @@
+:: Run Docker Image
+cd ..\..\..\unibo.basicrobot22
+start docker-compose -f .\virtualRobotOnly4.0.yaml up
+
+:: Open Chrome
+cd "C:\Program Files\Google\Chrome\Application\"
+start chrome.exe --new-window http:\\localhost:8090

Sprint1/Sprint1_Project/scripts/run_WasteService.bat

@@ -0,0 +1,10 @@
+cd ../sprint1_waste_service
+
+:: Run VirtualRobot Context
+start .\gradlew runCtx_Robot
+
+:: Run TransportTrolley Context
+start .\gradlew runCtx_TransportTrolley
+
+:: Run WasteService Context
+start .\gradlew runCtx_WasteService

Sprint1/Sprint1_Project/sprint1_echo_waste_server/lib/model/appl_message.dart

@@ -26,10 +26,9 @@ class ApplMessage {
 
   // msg(msgId, msgType, msgSender, msgReceiver, msgId(msgContent), msgNum)
   ApplMessage.fromString(String message) {
-    message = message.replaceAll('msg(', '');
     List<String> parsed = message.split(',');
 
-    msgId = parsed[0].trim();
+    msgId = parsed[0].split('(')[1].trim();
     message = message.replaceFirst(msgId, '');
     parsed.removeAt(0);
 

Sprint1/Sprint1_Project/sprint1_smart_device/lib/model/appl_message.dart

@@ -27,10 +27,9 @@ class ApplMessage {
 
   // msg(msgId, msgType, msgSender, msgReceiver, msgId(msgContent), msgNum)
   ApplMessage.fromString(String message) {
-    message = message.replaceAll('msg(', '');
     List<String> parsed = message.split(',');
 
-    msgId = parsed[0].trim();
+    msgId = parsed[0].split('(')[1].trim();
     message = message.replaceFirst(msgId, '');
     parsed.removeAt(0);
 

Sprint1/Sprint1_Project/sprint1_waste_service/Arch_demo_waste_service.py

@@ -0,0 +1,43 @@
+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('demo_waste_serviceArch', show=False, outformat='png', graph_attr=graphattr) as diag:
+  with Cluster('env'):
+     sys = Custom('','./qakicons/system.png')
+     with Cluster('ctx_demo_wasteservice', graph_attr=nodeattr):
+          typesprovider=Custom('typesprovider','./qakicons/symActorSmall.png')
+          wasteservice=Custom('wasteservice','./qakicons/symActorSmall.png')
+          transporttrolley=Custom('transporttrolley','./qakicons/symActorSmall.png')
+          pathexecutor=Custom('pathexecutor','./qakicons/symActorSmall.png')
+          basicrobot=Custom('basicrobot','./qakicons/symActorSmall.png')
+     typesprovider >> Edge(color='green', style='dashed', xlabel='typesreply') >> sys 
+     wasteservice >> Edge(color='magenta', style='solid', xlabel='deposit') >> transporttrolley
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadaccepted') >> sys 
+     transporttrolley >> Edge(color='magenta', style='solid', xlabel='dopath') >> pathexecutor
+     transporttrolley >> Edge(color='green', style='dashed', xlabel='pickupcompleted') >> sys 
+     transporttrolley >> Edge(color='blue', style='solid', xlabel='depositcompleted') >> wasteservice
+     pathexecutor >> Edge(color='blue', style='solid', xlabel='cmd') >> basicrobot
+     pathexecutor >> Edge(color='magenta', style='solid', xlabel='step') >> basicrobot
+     sys >> Edge(color='red', style='dashed', xlabel='alarm') >> pathexecutor
+     pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathdone') >> sys 
+     pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathfail') >> sys 
+     basicrobot >> Edge(color='green', style='dashed', xlabel='stepdone') >> sys 
+     basicrobot >> Edge(color='green', style='dashed', xlabel='stepfail') >> sys 
+diag

Sprint1/Sprint1_Project/sprint1_waste_service/Arch_logical_architecture_waste_service.py

@@ -0,0 +1,47 @@
+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('logical_architecture_waste_serviceArch', show=False, outformat='png', graph_attr=graphattr) as diag:
+  with Cluster('env'):
+     sys = Custom('','./qakicons/system.png')
+     with Cluster('ctx_smartdevice', graph_attr=nodeattr):
+          smartdevice_simulator=Custom('smartdevice_simulator','./qakicons/symActorSmall.png')
+     with Cluster('ctx_wasteservice', graph_attr=nodeattr):
+          typesprovider=Custom('typesprovider','./qakicons/symActorSmall.png')
+          wasteservice=Custom('wasteservice','./qakicons/symActorSmall.png')
+     with Cluster('ctx_transporttrolley', graph_attr=nodeattr):
+          transporttrolley=Custom('transporttrolley','./qakicons/symActorSmall.png')
+          pathexecutor=Custom('pathexecutor','./qakicons/symActorSmall.png')
+     with Cluster('ctx_robot', graph_attr=nodeattr):
+          basicrobot=Custom('basicrobot(ext)','./qakicons/externalQActor.png')
+     smartdevice_simulator >> Edge(color='magenta', style='solid', xlabel='typesrequest') >> typesprovider
+     smartdevice_simulator >> Edge(color='magenta', style='solid', xlabel='storerequest') >> wasteservice
+     typesprovider >> Edge(color='green', style='dashed', xlabel='typesreply') >> sys 
+     wasteservice >> Edge(color='magenta', style='solid', xlabel='deposit') >> transporttrolley
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
+     wasteservice >> Edge(color='green', style='dashed', xlabel='loadaccepted') >> sys 
+     transporttrolley >> Edge(color='magenta', style='solid', xlabel='dopath') >> pathexecutor
+     transporttrolley >> Edge(color='green', style='dashed', xlabel='pickupcompleted') >> sys 
+     transporttrolley >> Edge(color='blue', style='solid', xlabel='depositcompleted') >> wasteservice
+     pathexecutor >> Edge(color='blue', style='solid', xlabel='cmd') >> basicrobot
+     pathexecutor >> Edge(color='magenta', style='solid', xlabel='step') >> basicrobot
+     sys >> Edge(color='red', style='dashed', xlabel='alarm') >> pathexecutor
+     pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathdone') >> sys 
+     pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathfail') >> sys 
+diag

Sprint1/Sprint1_Project/sprint1_waste_service/Arch_waste_service.py

@@ -19,18 +19,14 @@
 with Diagram('waste_serviceArch', show=False, outformat='png', graph_attr=graphattr) as diag:
   with Cluster('env'):
      sys = Custom('','./qakicons/system.png')
-     with Cluster('ctx_smartdevice', graph_attr=nodeattr):
-          smartdevice_simulator=Custom('smartdevice_simulator','./qakicons/symActorSmall.png')
      with Cluster('ctx_wasteservice', graph_attr=nodeattr):
           typesprovider=Custom('typesprovider','./qakicons/symActorSmall.png')
           wasteservice=Custom('wasteservice','./qakicons/symActorSmall.png')
      with Cluster('ctx_transporttrolley', graph_attr=nodeattr):
           transporttrolley=Custom('transporttrolley','./qakicons/symActorSmall.png')
           pathexecutor=Custom('pathexecutor','./qakicons/symActorSmall.png')
      with Cluster('ctx_robot', graph_attr=nodeattr):
-          basicrobot=Custom('basicrobot(ext)','./qakicons/externalQActor.png')
-     smartdevice_simulator >> Edge(color='magenta', style='solid', xlabel='typesrequest') >> typesprovider
-     smartdevice_simulator >> Edge(color='magenta', style='solid', xlabel='storerequest') >> wasteservice
+          basicrobot=Custom('basicrobot','./qakicons/symActorSmall.png')
      typesprovider >> Edge(color='green', style='dashed', xlabel='typesreply') >> sys 
      wasteservice >> Edge(color='magenta', style='solid', xlabel='deposit') >> transporttrolley
      wasteservice >> Edge(color='green', style='dashed', xlabel='loadrejected') >> sys 
@@ -44,4 +40,6 @@
      sys >> Edge(color='red', style='dashed', xlabel='alarm') >> pathexecutor
      pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathdone') >> sys 
      pathexecutor >> Edge(color='green', style='dashed', xlabel='dopathfail') >> sys 
+     basicrobot >> Edge(color='green', style='dashed', xlabel='stepdone') >> sys 
+     basicrobot >> Edge(color='green', style='dashed', xlabel='stepfail') >> sys 
 diag