Commit a459b58a authored by Jérome Perrin's avatar Jérome Perrin

DefaultAllInOneEmpty2 from Ioannis

Conflicts:
	dream/simulation/Examples/DefaultAllInOneEmpty2.json
not sure of conflict resolution ...
parent e706a91f
...@@ -7,10 +7,6 @@ ...@@ -7,10 +7,6 @@
"title" : "Fixed", "title" : "Fixed",
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Fixed"]
},
"mean" : { "mean" : {
"type" : "number", "type" : "number",
"default" : 0.75, "default" : 0.75,
...@@ -23,10 +19,6 @@ ...@@ -23,10 +19,6 @@
"title": "Exp", "title": "Exp",
"description" : "Exponential", "description" : "Exponential",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Exp"]
},
"mean" : { "mean" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -39,10 +31,6 @@ ...@@ -39,10 +31,6 @@
"title" : "Normal", "title" : "Normal",
"description" : "Normal", "description" : "Normal",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Normal"]
},
"mean" : { "mean" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -60,16 +48,14 @@ ...@@ -60,16 +48,14 @@
"title" : "Lognormal", "title" : "Lognormal",
"description" : "Lognormal", "description" : "Lognormal",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Lognormal"]
},
"mean" : { "mean" : {
"_class" : "Dream.Property",
"name" : "Mean", "name" : "Mean",
"type" : "number", "type" : "number",
"default" : 0 "default" : 0
}, },
"stdev" : { "stdev" : {
"_class" : "Dream.Property",
"name" : "Standard Deviation", "name" : "Standard Deviation",
"type" : "number", "type" : "number",
"default" : 0 "default" : 0
...@@ -81,10 +67,6 @@ ...@@ -81,10 +67,6 @@
"title" : "Binomial", "title" : "Binomial",
"description" : "Binomial", "description" : "Binomial",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Binomial"]
},
"mean" : { "mean" : {
"type" : "number", "type" : "number",
"default" : 0 "default" : 0
...@@ -100,10 +82,6 @@ ...@@ -100,10 +82,6 @@
"title" : "Poisson", "title" : "Poisson",
"description" : "Poisson", "description" : "Poisson",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Poisson"]
},
"lambda" : { "lambda" : {
"type" : "number", "type" : "number",
"default" : 0 "default" : 0
...@@ -115,10 +93,6 @@ ...@@ -115,10 +93,6 @@
"title" : "Logistic", "title" : "Logistic",
"description" : "Logistic", "description" : "Logistic",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Logistic"]
},
"location" : { "location" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -136,10 +110,6 @@ ...@@ -136,10 +110,6 @@
"title" : "Caucy", "title" : "Caucy",
"description" : "Caucy", "description" : "Caucy",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Caucy"]
},
"location" : { "location" : {
"type" : "number", "type" : "number",
"default" : 0 "default" : 0
...@@ -155,10 +125,6 @@ ...@@ -155,10 +125,6 @@
"title" : "Geometric", "title" : "Geometric",
"description" : "Geometric", "description" : "Geometric",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Geometric"]
},
"probability" : { "probability" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -171,10 +137,6 @@ ...@@ -171,10 +137,6 @@
"title" : "Gama", "title" : "Gama",
"description" : "Gama", "description" : "Gama",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Gama"]
},
"shape" : { "shape" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -192,10 +154,6 @@ ...@@ -192,10 +154,6 @@
"title" : "Weibull", "title" : "Weibull",
"description" : "Weibull", "description" : "Weibull",
"properties" : { "properties" : {
"distribution": {
"type" : "string",
"enum": ["Weibull"]
},
"shape" : { "shape" : {
"type" : "number", "type" : "number",
"default" : 0, "default" : 0,
...@@ -233,7 +191,7 @@ ...@@ -233,7 +191,7 @@
} }
}, },
"_no" : { "_no" : {
"type" : "string", "type" : "object",
"title" : "No", "title" : "No",
"description" : "None" "description" : "None"
}, },
...@@ -291,6 +249,28 @@ ...@@ -291,6 +249,28 @@
] ]
}, },
"_dist" : { "_dist" : {
"allOf" : [{
"type" : "object",
"properties" : {
"distribution" : {
"type" : "string",
"default" : "Fixed",
"enum" : [
"Fixed",
"Exp",
"Normal",
"Longnormal",
"Binomial",
"Poisson",
"Logistic",
"Caucy",
"Geometric",
"Gama",
"Weibull"
]
}
}
}, {
"oneOf" : [{ "oneOf" : [{
"$ref" : "#/definitions/distributionTypes/_fixed" "$ref" : "#/definitions/distributionTypes/_fixed"
}, { }, {
...@@ -315,9 +295,11 @@ ...@@ -315,9 +295,11 @@
"$ref" : "#/definitions/distributionTypes/_weibull" "$ref" : "#/definitions/distributionTypes/_weibull"
} }
] ]
}
]
}, },
"_schedulingRule" : { "_schedulingRule" : {
"description" : "Scheduling Rule", "description" : "Scheduling Rule, one of FIFO Priority EDD EOD NumStages RPC LPT SPT MS WINQ",
"type" : "string", "type" : "string",
"default" : "FIFO", "default" : "FIFO",
"enum" : [ "enum" : [
...@@ -348,9 +330,12 @@ ...@@ -348,9 +330,12 @@
] ]
}, },
"_operationType" : { "_operationType" : {
"_class" : "Dream.PropertyList",
"name" : "Operation type", "name" : "Operation type",
"id" : "operationType", "id" : "operationType",
"description" : "the type of operations that are performed manually in the machine", "description" : "the type of operations that are performed manually in the machine",
"properties" : {
"operationType" : {
"type" : "string", "type" : "string",
"enum" : [ "enum" : [
"Load", "Load",
...@@ -362,6 +347,8 @@ ...@@ -362,6 +347,8 @@
"MT-Setup-Processing" "MT-Setup-Processing"
] ]
} }
}
}
}, },
"edge" : { "edge" : {
"description" : "Base definition for edge", "description" : "Base definition for edge",
...@@ -420,13 +407,23 @@ ...@@ -420,13 +407,23 @@
"Dream.Exit" : { "Dream.Exit" : {
"_class" : "node", "_class" : "node",
"name" : "Exit", "name" : "Exit",
"css": { "colour" : "#F0F",
"color" : "#F0F"
},
"shape" : "rectangle", "shape" : "rectangle",
"description" : "A station where entities exits from the system", "description" : "A station where entities exits from the system",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, {
"type" : "object",
"properties" : {
"name" : {
"type" : "string",
"default" : "Exit"
},
"id" : {
"default" : "E",
"required" : true
}
}
} }
] ]
}, },
...@@ -435,10 +432,18 @@ ...@@ -435,10 +432,18 @@
"_class" : "node", "_class" : "node",
"description" : "A buffer where entites can be hold until the next station is ready to process them", "description" : "A buffer where entites can be hold until the next station is ready to process them",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, { }, {
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"name" : {
"type" : "string",
"default" : "Queue"
},
"id" : {
"type" : "string",
"default" : "Q"
},
"capacity" : { "capacity" : {
"$ref" : "#/definitions/_capacity", "$ref" : "#/definitions/_capacity",
"required" : true "required" : true
...@@ -460,10 +465,19 @@ ...@@ -460,10 +465,19 @@
"description" : "A station processing items for some time given by a distribution", "description" : "A station processing items for some time given by a distribution",
"_class" : "node", "_class" : "node",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, { }, {
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"name" : {
"type" : "string",
"default" : "Machine"
},
"id" : {
"type" : "string",
"default" : "M",
"required" : true
},
"processingTime" : { "processingTime" : {
"$ref" : "#/definitions/_dist", "$ref" : "#/definitions/_dist",
"required" : true "required" : true
...@@ -473,18 +487,27 @@ ...@@ -473,18 +487,27 @@
"required" : true "required" : true
} }
} }
]
} }
]
}, },
"Dream.Source" : { "Dream.Source" : {
"name" : "Source", "name" : "Source",
"_class" : "node", "_class" : "node",
"description" : "A station creating entities", "description" : "A station creating entities",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, { }, {
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"name" : {
"type" : "string",
"default" : "Source"
},
"id" : {
"type" : "string",
"default" : "S",
"required" : true
},
"interArrivalTime" : { "interArrivalTime" : {
"description" : "Inter-arrivaltime", "description" : "Inter-arrivaltime",
"$ref" : "#/definitions/_dist", "$ref" : "#/definitions/_dist",
...@@ -505,10 +528,19 @@ ...@@ -505,10 +528,19 @@
"_class" : "node", "_class" : "node",
"description" : "Attainment", "description" : "Attainment",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, { }, {
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"name" : {
"type" : "string",
"default" : "Attainment"
},
"id" : {
"type" : "string",
"default" : "A",
"required" : true
},
"start" : { "start" : {
"description" : "Starttime", "description" : "Starttime",
"type" : "number", "type" : "number",
...@@ -554,10 +586,19 @@ ...@@ -554,10 +586,19 @@
"_class" : "node", "_class" : "node",
"description" : "A resource that repairs stations in failure", "description" : "A resource that repairs stations in failure",
"allOf" : [{ "allOf" : [{
"$ref" : "#/node" "$ref" : "#/class_definition/node"
}, { }, {
"type" : "object", "type" : "object",
"properties" : { "properties" : {
"name" : {
"type" : "string",
"default" : "Repairman"
},
"id" : {
"type" : "string",
"default" : "R",
"required" : true
},
"capacity" : { "capacity" : {
"$ref" : "#/definitions/_capacity", "$ref" : "#/definitions/_capacity",
"required" : true "required" : true
......
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