Skip to content

dream
dream
Commit 4a54008d authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin
Browse files
Options

more corrections

parent 46f9359c
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
dream/simulation/JSONInputs/CapacityStationAssembly1.json
View file @ 4a54008d
......@@ -52,17 +52,17 @@
},
"nodes": {
"CB1": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "SMFBuffer",
"wip": [
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P1",
"name": "P1_SMF_100",
"requiredCapacity": 100
},
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P2",
"name": "P2_SMF_50",
"requiredCapacity": 50
......@@ -70,7 +70,7 @@
]
},
"CS1": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "SMF",
"intervalCapacity": [
100,
......@@ -82,16 +82,16 @@
]
},
"CE1": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"nextCapacityStationBufferId": "CB2",
"name": "SMFExit"
},
"CB2": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "WELDBuffer"
},
"CS2": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "WELD",
"intervalCapacity": [
150,
......@@ -103,7 +103,7 @@
]
},
"CE2": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"nextCapacityStationBufferId": "CB4",
"name": "WELDExit"
},
......@@ -114,7 +114,7 @@
"name": "DUMMY",
"wip": [
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P1",
"name": "P1",
"capacityRequirementDict": {
......@@ -125,7 +125,7 @@
}
},
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P2",
"name": "P2",
"capacityRequirementDict": {
......@@ -138,17 +138,17 @@
]
},
"CB3": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "CNCBuffer",
"wip": [
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P1",
"name": "P1_CNC_50",
"requiredCapacity": 50
},
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P2",
"name": "P2_CNC_100",
"requiredCapacity": 100
......@@ -156,7 +156,7 @@
]
},
"CS3": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "CNC",
"intervalCapacity": [
50,
......@@ -168,18 +168,18 @@
]
},
"CE3": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"nextCapacityStationBufferId": "CB4",
"name": "CNCExit"
},
"CB4": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "AssemblyBuffer",
"requireFullProject":1,
"wip": []
},
"CS4": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "Assembly",
"intervalCapacity": [
50,
......@@ -191,11 +191,11 @@
]
},
"CE4": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"name": "AssemblyExit"
},
"CSC": {
"_class": "Dream.CapacityStationController",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationController.CapacityStationController",
"name": "CSC",
"interval": "1" }
}
......
dream/simulation/JSONInputs/CapacityStationSpace2.json
View file @ 4a54008d
......@@ -34,18 +34,18 @@
},
"nodes": {
"CB1": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "PPASBBuffer",
"requireFullProject": 1,
"wip": [
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P1",
"name": "P1_ASBTST_50",
"requiredCapacity": 50
},
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P2",
"name": "P2_ASBTST_50",
"requiredCapacity": 50
......@@ -53,7 +53,7 @@
]
},
"CS1": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "PPASB",
"intervalCapacity": [
100,
......@@ -71,17 +71,17 @@
}
},
"CE1": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"name": "PPASBExit",
"nextCapacityStationBufferId": "CB2"
},
"CB2": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "ASBTSTBuffer",
"requireFullProject": 1
},
"CS2": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "ASBTST",
"intervalCapacity": [
100,
......@@ -99,7 +99,7 @@
}
},
"CE2": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"name": "ASBTSTExit"
},
"QD": {
......@@ -109,7 +109,7 @@
"name": "DUMMY",
"wip": [
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P1",
"name": "P1",
"capacityRequirementDict": {
......@@ -120,7 +120,7 @@
"assemblySpaceRequirement":50
},
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P2",
"name": "P2",
"capacityRequirementDict": {
......@@ -133,7 +133,7 @@
]
},
"CSC": {
"_class": "Dream.CapacityStationController",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationController.CapacityStationController",
"name": "CSC",
"start": "0",
"interval": "1",
......
dream/simulation/JSONInputs/CapacityStationSpace3.json
View file @ 4a54008d
......@@ -34,12 +34,12 @@
},
"nodes": {
"CB1": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "PPASBBuffer",
"requireFullProject": 1,
"wip": [
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P1",
"name": "P1_ASBTST_50",
"requiredCapacity": 50
......@@ -47,7 +47,7 @@
]
},
"CS1": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "PPASB",
"intervalCapacity": [
80,
......@@ -65,17 +65,17 @@
}
},
"CE1": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"name": "PPASBExit",
"nextCapacityStationBufferId": "CB2"
},
"CB2": {
"_class": "Dream.CapacityStationBuffer",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationBuffer.CapacityStationBuffer",
"name": "ASBTSTBuffer",
"requireFullProject": 1,
"wip": [
{
"_class": "Dream.CapacityEntity",
"_class": "dream.simulation.applications.CapacityStations.CapacityEntity.CapacityEntity",
"capacityProjectId": "P2",
"name": "P2_ASBTST_50",
"requiredCapacity": 50
......@@ -83,7 +83,7 @@
]
},
"CS2": {
"_class": "Dream.CapacityStation",
"_class": "dream.simulation.applications.CapacityStations.CapacityStation.CapacityStation",
"name": "ASBTST",
"sharedResources": {
"stationIds": [
......@@ -93,7 +93,7 @@
}
},
"CE2": {
"_class": "Dream.CapacityStationExit",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationExit.CapacityStationExit",
"name": "ASBTSTExit"
},
"QD": {
......@@ -103,7 +103,7 @@
"name": "DUMMY",
"wip": [
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P1",
"name": "P1",
"capacityRequirementDict": {
......@@ -114,7 +114,7 @@
"assemblySpaceRequirement":50
},
{
"_class": "Dream.CapacityProject",
"_class": "dream.simulation.applications.CapacityStations.CapacityProject.CapacityProject",
"id": "P2",
"name": "P2",
"capacityRequirementDict": {
......@@ -129,7 +129,7 @@
]
},
"CSC": {
"_class": "Dream.CapacityStationController",
"_class": "dream.simulation.applications.CapacityStations.CapacityStationController.CapacityStationController",
"name": "CSC",
"start": "0",
"interval": "1",
......
dream/simulation/applications/CapacityStations/CapacityStation.py
View file @ 4a54008d
......@@ -57,7 +57,7 @@ class CapacityStation(Queue):
# then read it from some other of the sharing stations
if not self.intervalCapacity and self.sharedResources:
for stationId in self.sharedResources.get('stationIds',[]):
import dream.simulation.Globals
import dream.simulation.Globals as Globals
station=Globals.findObjectById(stationId)
if station.intervalCapacity:
self.intervalCapacity=station.intervalCapacity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7