Develop

.gitattributes

@@ -2,3 +2,4 @@
 
 *.sh text eol=lf
 *.bat text eol=crlf
+* -crlf

README-Swim-Hybrid

@@ -0,0 +1,10 @@
+Use ./compile.sh to build Rainbow.
+Set the following environment variables
+
+(1) RAINBOW - should point to the Rainbow directory. This path is used to location final_ibl.prism file used to generate Pism specification. The path to this file should be $RAINBOW/pladapt/templates/final_ibl.prism
+(2) PRISM -  should point to the directory where Prism is installed.
+
+Other potential settings that might need a change.
+
+Path to SWIG installation might depend on a specific machine. SWIG is used to compile pladapt project. Refer to the compilation instruction for pladapt project.
+

README.md

@@ -12,14 +12,15 @@ Research into Rainbow at CMU can be found in quite a few papers, detailed on the
 - [Building from Source](#building)
 - [New and Noteworthy in Rainbow Yellow](NewAndNoteworthy.md)
 - [Rainbow Simple Example Setup](deployments/rainbow-example/docker/INSTRUCTIONS.md)
+- [Rainbow Configuration IDE with Eclipse and XText](documents/RCL.md)
 
 ## Repository organization
 This repository is organized into the following folders:
 
 - **libs**: Contains the source of some in-house libraries used by Rainbow for distributed communication.
 - **rainbow**: Contains Rainbow framework code, including definition of general Acme models for use inside the Models Manager, and the source for the adaptation language *Stitch*.
 - **deployments**: Contains code to implement various specializations of Rainbow used in research projects
-- **ide**: Contains code to implement specialized UIs, IDE integration, etc. that are probably not of general interest but are here for completeness.
+- **ide**: Contains code to implement specialized UIs, IDE integration, etc. The Eclipse Rainbow configuration plugins live here, as well as some redundant and old code.
 - **documents**: Contains various documentation associated with using Rainbow
 - **scripts**: Contains the scripts that are placed in the deployment that is constructed when building Rainbow
 - **target-system/znn**: Contains the code for implementing one of the benchmark systems described in papers, ZNN.

build.sh

@@ -102,57 +102,64 @@ cd libs/
 
 echo "Doing $target for auxtestlib"
 cd auxtestlib
-mvn $SKIPTESTS $target || exit 1
+mvn $SKIPTESTS $target
 
 echo "Doing $target for incubator"
 cd ../incubator
-mvn $SKIPTESTS $target || exit 1
+mvn $SKIPTESTS $target
 
 echo "Doing $target for parsec"
 cd ../parsec
-mvn -DskipTests $jcctarget || exit 1
+mvn -DskipTests $jcctarget 
 
 echo "Doing $target for typelib"
 cd ../typelib
-mvn $SKIPTESTS $jcctarget || exit 1
+mvn $SKIPTESTS $jcctarget 
 
 echo "Doing $target for eselib"
 cd ../eseblib
-mvn -DskipTests $target || exit 1
+mvn -DskipTests $target 
 
 cd ../../rainbow
 
 echo "Doing $target for rainbow-core"
 cd rainbow-core
-mvn -DskipTests $target || exit 1
+mvn -DskipTests $target 
 
 echo "Doing $target for rainbow-gui"
 cd ../rainbow-gui
-mvn -DskipTests $target || exit 1
+mvn -DskipTests $target 
 
 echo "Doing $target for rainbow-acme-model"
 cd ../rainbow-acme-model
-mvn -DskipTests $target || exit 1
+mvn -DskipTests $target
+
+echo "Doing $target for rainbow-stitch"
+cd ../rainbow-stitch
+mvn $SKIPTESTS $target
 
 echo "Doing $target for rainbow-utility-model"
-cd ../rainbow-utility-model || exit 1
-mvn $target
+cd ../rainbow-utility-model 
+mvn $SKIPTESTS $target 
 
-echo "Doing $target for rainbow-stitch"
+echo "Doing $target for rainbow-mem-comms"
+cd ../rainbow-mem-comms
+mvn $SKIPTESTS $target
 
-cd ../rainbow-stitch
-mvn $SKIPTESTS $target || exit 1
+cd ../../ide/org.acme.xtext.parent
+mvn $SKIPTESTS $target
 
-echo "Doing $target for rainbow-gui"
+cd ../../ide/org.sa.rainbow.stitch.parent
+mvn $SKIPTESTS $target
 
-cd ../rainbow-gui
-mvn $SKIPTESTS $target || exit 1
+cd ../../ide/org.sa.rainbow.configuration.parent
+mvn $SKIPTESTS $target
 
 cd ../..
 BUILDDIR=`pwd`
 cd $DEPLOYMENT
 echo "Doing $target in $(pwd)"
-mvn $SKIPTESTS $target || exit 1
+mvn $SKIPTESTS $target 
 
 if [[ "$target" == "install" ]]; then
   mkdir -p $BUILDDIR/bin/lib

compile.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+./build.sh -s -d rainbow-swim-hybrid -t swim-hybrid
+cp rainbow-swim.properties Rainbow-build/targets/swim-hybrid/
+cp -rf pladapt/ Rainbow-build/
+

deployments/rainbow-brass/brass-p3-cp1/.gitignore

@@ -1,4 +1,4 @@
-/log/
-/prism/
+log/
+prism/
 
-!/prism/mapbotp2cp1.props
+!mapbotp2cp1.props

deployments/rainbow-brass/brass-p3-cp1/prism/mapbotp2cp1.props

@@ -0,0 +1,5 @@
+R{"time"}min=? [ F goal ]
+
+R{"energy"}max=? [ F end ]
+
+

deployments/rainbow-brass/brass-p3-cp1/rainbow-cp1_ta.properties

@@ -1,86 +1,86 @@
-logging.level = INFO
-event.log.path = log
-logging.path = ${event.log.path}/rainbow.out
-monitoring.log.path = ${event.log.path}/rainbow-data.log
-
-rainbow.deployment.location=cp1_ta
-rainbow.master.location.host = cp1_ta
-rainbow.master.location.port = 1100
-rainbow.deployment.environment = linux
-rainbow.event.service = eseb
-rainbow.port.timeout=120000
-
-rainbow.delegate.beaconperiod = 10000
-rainbow.deployment.factory.class = org.sa.rainbow.core.ports.eseb.ESEBRainbowPortFactory
-
-rainbow.model.number = 7
-
-# Rainbow instruction graph model
-#/home/vagrant/catkin_ws/src/cp1_gazebo/instructions/newnav.ig
-rainbow.model.load.class_3 = org.sa.rainbow.brass.model.instructions.InstructionGraphCommandFactory
-rainbow.model.name_3 = ExecutingInstructionGraph
-#
-rainbow.model.load.class_4 = org.sa.rainbow.brass.model.p2_cp3.mission.MissionCommandFactory
-rainbow.model.name_4 = MissionState
-rainbow.model.saveOnClose_4=true
-rainbow.model.saveLocation_4=model/state-post.txt
-
-rainbow.model.load.class_5 = org.sa.rainbow.brass.model.map.EnvMapCommandFactory
-rainbow.model.name_5 = Map
-
-rainbow.model.load.class_0=org.sa.rainbow.brass.model.p2_cp3.rainbowState.RainbowStateCommandFactory
-rainbow.model.name_0=RainbowState
-
-
-rainbow.model.load.class_2 =org.sa.rainbow.brass.model.p2_cp1.robot.CP1RobotStateCommandFactory
-rainbow.model.name_2 = Robot
-rainbow.model.saveOnClose_2=true
-rainbow.model.saveLocation_2=model/robot-post.txt
-
-rainbow.model.load.class_1 = org.sa.rainbow.brass.model.p2_cp3.clock.ClockCommandFactory
-rainbow.model.name_1 = Clock
-
-rainbow.model.load.class_6 = org.sa.rainbow.brass.p3_cp1.model.power.PowerModelCommandFactory
-rainbow.model.name_6 = Power
-rainbow.model.path_6 = /home/mars/cp1/config_list.json
-
-rainbow.analyses.size = 4
-rainbow.analyses_0 = org.sa.rainbow.brass.analyses.p2_cp3.UpdateClockModel
-rainbow.analyses_1 =  org.sa.rainbow.brass.analyses.p2_cp1.BRASSMissionAnalyzer
-rainbow.analyses_2 = org.sa.rainbow.brass.analyses.p2_cp1.EnergyConsumptionAnalyzer
-rainbow.analyses_3 = org.sa.rainbow.brass.analyses.IGWaypointAnalyzer
-
-rainbow.adaptation.manager.size = 1
-rainbow.adaptation.manager.class_0 = org.sa.rainbow.brass.adaptation.p2_cp1.CP1BRASSAdaptationPlanner
-rainbow.adaptation.manager.model_0 = RainbowState:RainbowState
-
-rainbow.adaptation.executor.size = 1
-rainbow.adaptation.executor.class_0 = org.sa.rainbow.brass.adaptation.PlanExecutor
-rainbow.adaptation.executor.model_0 = RainbowState:RainbowState
-
-rainbow.effector.manager.size = 1
-rainbow.effector.manager.class_0 = org.sa.rainbow.brass.effectors.BRASSEffectorManager
-
-rainbow.gui = org.sa.rainbow.gui.RainbowWindow
-
-# PRISM properties - not relative to target
-prism.bin = ~/das/prism-4.3.1-linux64/bin/prism
-prism.model = ${rainbow.path}/prism/prismtmp.prism
-prism.properties = ${rainbow.path}/prism/mapbotp2cp1.props
-prism.parameters = INITIAL_BATTERY=5000
-prism.adv.export = ${rainbow.path}/prism/botpolicy.adv
-prism.tmpdir = "${rainbow.path}/prism/"
-customize.map.json = ~/catkin_ws/src/cp1_base/maps/cp1_map.json
-
-customize.model.evaluate.period = 2000
-customize.gauges.path = model/gauges.yml
-customize.probes.path = system/probes.yml
-customize.effectors.path = system/effectors.yml
-customize.scripts.path = stitch
-
-customize.system.target.master = ${rainbow.master.location.host}
-customize.system.target.ros = ${rainbow.master.location.host}
-brass.challenge = 3
-
-configsource = ~/cp1/config_list.json
+logging.level = INFO
+event.log.path = log
+logging.path = ${event.log.path}/rainbow.out
+monitoring.log.path = ${event.log.path}/rainbow-data.log
+
+rainbow.master.location.host = 127.0.0.1
+rainbow.master.location.port = 1100
+rainbow.deployment.environment = linux
+rainbow.event.service = local
+
+rainbow.delegate.beaconperiod = 10000
+rainbow.deployment.factory.class = org.sa.rainbow.core.ports.guava.GuavaRainbowPortFactory
+
+rainbow.model.number = 7
+
+# Rainbow instruction graph model
+#/home/vagrant/catkin_ws/src/cp1_gazebo/instructions/newnav.ig
+rainbow.model.load.class_3 = org.sa.rainbow.brass.model.instructions.InstructionGraphCommandFactory
+rainbow.model.name_3 = ExecutingInstructionGraph
+#
+rainbow.model.load.class_4 = org.sa.rainbow.brass.model.p2_cp3.mission.MissionCommandFactory
+rainbow.model.name_4 = MissionState
+rainbow.model.saveOnClose_4=true
+rainbow.model.saveLocation_4=model/state-post.txt
+
+rainbow.model.load.class_5 = org.sa.rainbow.brass.model.map.EnvMapCommandFactory
+rainbow.model.name_5 = Map
+
+rainbow.model.load.class_0=org.sa.rainbow.brass.model.p2_cp3.rainbowState.RainbowStateCommandFactory
+rainbow.model.name_0=RainbowState
+
+
+rainbow.model.load.class_2 =org.sa.rainbow.brass.p3_cp1.model.robot.CP1RobotStateCommandFactory
+rainbow.model.name_2 = Robot
+rainbow.model.saveOnClose_2=true
+rainbow.model.saveLocation_2=model/robot-post.txt
+
+rainbow.model.load.class_1 = org.sa.rainbow.brass.model.p2_cp3.clock.ClockCommandFactory
+rainbow.model.name_1 = Clock
+
+rainbow.model.load.class_6 = org.sa.rainbow.brass.p3_cp1.model.power.PowerModelCommandFactory
+rainbow.model.name_6 = Power
+rainbow.model.path_6 = /home/mars/cp1/config_list.json
+
+
+rainbow.analyses.size = 5
+rainbow.analyses_0 = org.sa.rainbow.brass.analyses.p2_cp3.UpdateClockModel
+rainbow.analyses_1 =  org.sa.rainbow.brass.p3_cp1.analysis.BRASSMissionAnalyzer
+rainbow.analyses_2 = org.sa.rainbow.brass.p3_cp1.analysis.EnergyConsumptionAnalyzer
+rainbow.analyses_3 = org.sa.rainbow.brass.analyses.IGWaypointAnalyzer
+rainbow.analyses_4 = org.sa.rainbow.brass.p3_cp1.analysis.MapResetter
+
+rainbow.adaptation.manager.size = 1
+rainbow.adaptation.manager.class_0 = org.sa.rainbow.brass.p3_cp1.adaptation.CP1BRASSAdaptationPlanner
+rainbow.adaptation.manager.model_0 = RainbowState:RainbowState
+
+rainbow.adaptation.executor.size = 1
+rainbow.adaptation.executor.class_0 = org.sa.rainbow.brass.adaptation.PlanExecutor
+rainbow.adaptation.executor.model_0 = RainbowState:RainbowState
+
+rainbow.effector.manager.size = 1
+rainbow.effector.manager.class_0 = org.sa.rainbow.brass.effectors.BRASSEffectorManager
+
+rainbow.gui = org.sa.rainbow.gui.RainbowWindow
+
+# PRISM properties - not relative to target
+prism.bin = ~/das/prism-4.3.1-linux64/bin/prism
+prism.model = ${rainbow.path}/prism/prismtmp.prism
+prism.properties = ${rainbow.path}/prism/mapbotp2cp1.props
+prism.parameters = INITIAL_BATTERY=5000
+prism.adv.export = ${rainbow.path}/prism/botpolicy.adv
+prism.tmpdir = "/home/mars/logs/prism/"
+customize.map.json = ~/catkin_ws/src/cp1_base/maps/cp1_map.json
+
+customize.model.evaluate.period = 2000
+customize.gauges.path = model/gauges.yml
+customize.probes.path = system/probes.yml
+customize.effectors.path = system/effectors.yml
+customize.scripts.path = stitch
+
+customize.system.target.master = ${rainbow.master.location.host}
+customize.system.target.ros = ${rainbow.master.location.host}
+brass.challenge = 3
+
+configsource = ~/cp1/config_list.json
 batteryconfigsource = ~/cp1/config.json