Commit b2c8e6b2 authored by Nicolas Seydoux's avatar Nicolas Seydoux
Browse files

Added new distribution topology

parent 6e31e500
......@@ -119,13 +119,13 @@ python3 simulator/generator.py -t simulator/coopis/scala_distributed/clone_f_2_r
# python3 simulator/generator.py -t simulator/coopis/specialisation/specialisation_implementation.json -o simulator/coopis/specialisation_implementation_adp -c adp
#############################
# echo "Distribution local"
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_0.json -o simulator/coopis/distribution_0_cdr -c cdr
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_0.json -o simulator/coopis/distribution_0_cir -c cir
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_0.json -o simulator/coopis/distribution_0_cdp -c cdp
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_0.json -o simulator/coopis/distribution_0_cip -c cip
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_0.json -o simulator/coopis/distribution_0_adp -c adp
#
echo "Distribution local"
python3 simulator/generator.py -t simulator/thesis/distribution/distribution_0.json -o simulator/thesis/distribution_0_cdr -c cdr
python3 simulator/generator.py -t simulator/thesis/distribution/distribution_0.json -o simulator/thesis/distribution_0_cir -c cir
python3 simulator/generator.py -t simulator/thesis/distribution/distribution_0.json -o simulator/thesis/distribution_0_cdp -c cdp
python3 simulator/generator.py -t simulator/thesis/distribution/distribution_0.json -o simulator/thesis/distribution_0_cip -c cip
python3 simulator/generator.py -t simulator/thesis/distribution/distribution_0.json -o simulator/thesis/distribution_0_adp -c adp
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_1.json -o simulator/coopis/distribution_1_cdr -c cdr
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_1.json -o simulator/coopis/distribution_1_cir -c cir
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_1.json -o simulator/coopis/distribution_1_cdp -c cdp
......@@ -144,30 +144,30 @@ python3 simulator/generator.py -t simulator/coopis/scala_distributed/clone_f_2_r
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_3.json -o simulator/coopis/distribution_3_cip -c cip
# python3 simulator/generator.py -t simulator/coopis/distribution_syndream/distribution_3.json -o simulator/coopis/distribution_3_adp -c adp
echo "Distribution distrib"
python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cdr -c cdr
python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cir -c cir
python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cdp -c cdp
python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cip -c cip
python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_adp -c adp
python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cdr -c cdr
python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cir -c cir
python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cdp -c cdp
python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cip -c cip
python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_adp -c adp
python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cdr -c cdr
python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cir -c cir
python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cdp -c cdp
python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cip -c cip
python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_adp -c adp
python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cdr -c cdr
python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cir -c cir
python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cdp -c cdp
python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cip -c cip
python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_adp -c adp
# echo "Distribution distrib"
# python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cdr -c cdr
# python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cir -c cir
# python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cdp -c cdp
# python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_cip -c cip
# python3 simulator/generator.py -t simulator/iswc/sb_d1.json -o simulator/coopis/sb_d1_adp -c adp
#
# python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cdr -c cdr
# python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cir -c cir
# python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cdp -c cdp
# python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_cip -c cip
# python3 simulator/generator.py -t simulator/iswc/sb_d2.json -o simulator/coopis/sb_d2_adp -c adp
#
# python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cdr -c cdr
# python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cir -c cir
# python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cdp -c cdp
# python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_cip -c cip
# python3 simulator/generator.py -t simulator/iswc/sb_d3.json -o simulator/coopis/sb_d3_adp -c adp
#
# python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cdr -c cdr
# python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cir -c cir
# python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cdp -c cdp
# python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_cip -c cip
# python3 simulator/generator.py -t simulator/iswc/sb_d4.json -o simulator/coopis/sb_d4_adp -c adp
# python3 simulator/generator.py -t simulator/coopis/distribution_distributed/distribution_0.json -o simulator/coopis/distribution_rpi23sb_0_cdr -c cdr
# python3 simulator/generator.py -t simulator/coopis/distribution_distributed/distribution_0.json -o simulator/coopis/distribution_rpi23sb_0_cir -c cir
......
{
"name": "myFactory",
"centralized": "adp",
"layers": {
"count": 1,
"type": "building",
"concentrates": [
{
"concentrates": [
{
"concentrates": [
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000"
},
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001"
}
],
"count": 1,
"type": "gallery",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00"
},
{
"concentrates": [
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010"
},
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011"
}
],
"count": 1,
"type": "gallery",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01"
}
],
"count": 1,
"type": "floor",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Floor0"
},
{
"concentrates": [
{
"concentrates": [
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100"
},
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101"
}
],
"count": 1,
"type": "gallery",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10"
},
{
"concentrates": [
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine110"
},
{
"concentrates": [],
"count": 1,
"type": "room",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine111"
}
],
"count": 1,
"type": "gallery",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor11"
}
],
"count": 1,
"type": "floor",
"host": "http://localhost",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Floor1"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "particle_level",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine000",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "temperature",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine001",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00",
"measures": "conveyor_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00",
"measures": "conveyor_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor00",
"measures": "supervisor_presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "particle_level",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine010",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "temperature",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine011",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01",
"measures": "conveyor_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01",
"measures": "conveyor_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor01",
"measures": "supervisor_presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "particle_level",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine100",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "temperature",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "machine_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "product_quality",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Machine101",
"measures": "machine_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10",
"measures": "luminosity",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10",
"measures": "presence",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10",
"measures": "conveyor_state",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10",
"measures": "conveyor_speed",
"up": 0,
"host": "http://localhost"
},
{
"count": 1,
"type": "sensor",
"feature": "https://w3id.org/laas-iot/edr/iiot/factory#Conveyor10",
"measures": "supervisor_presence",