distribution definition corrected in ReadJSWIP and ReadJSWorkPlan

parent 55dccb56
...@@ -59,9 +59,9 @@ class ReadJSWIP(ReadJSWorkPlan.ReadJSWorkPlan, TimeSupportMixin): ...@@ -59,9 +59,9 @@ class ReadJSWIP(ReadJSWorkPlan.ReadJSWorkPlan, TimeSupportMixin):
route = part.get("route",[]) route = part.get("route",[])
for step in route: for step in route:
if step["task_id"] == WP_id: if step["task_id"] == WP_id:
processingTime = step.get("processingTime", {"fixed":{"meam":0}}) processingTime = step.get("processingTime", {"Fixed":{"meam":0}})
# the distribution of the processing time is supposed to be fixed (see ReadJSWorkPlan)) # the distribution of the processing time is supposed to be fixed (see ReadJSWorkPlan))
processingTime = float(processingTime["fixed"].get("mean",0)) processingTime = float(processingTime["Fixed"].get("mean",0))
# calculate the remaining Processing Time # calculate the remaining Processing Time
remainingProcessingTime = processingTime - elapsedTime remainingProcessingTime = processingTime - elapsedTime
assert remainingProcessingTime>=0, "the remaining processing cannot be negative" assert remainingProcessingTime>=0, "the remaining processing cannot be negative"
......
...@@ -71,7 +71,7 @@ class ReadJSWorkPlan(plugin.InputPreparationPlugin): ...@@ -71,7 +71,7 @@ class ReadJSWorkPlan(plugin.InputPreparationPlugin):
route.append({ route.append({
"task_id": task_id, "task_id": task_id,
"sequence": sequence, "sequence": sequence,
"processingTime": {"fixed":{"mean":processingTime}}, "processingTime": {"Fixed":{"mean":processingTime}},
"operator": operator, "operator": operator,
"partsneeded": partsneeded, "partsneeded": partsneeded,
"technology": technology, "technology": technology,
......
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