Commit f70cc225 authored by Georgios Dagkakis's avatar Georgios Dagkakis

Main script changed so that MachineJobShop and inherited objects do not read processingTime

parent c92baf32
...@@ -400,7 +400,6 @@ def createObjects(): ...@@ -400,7 +400,6 @@ def createObjects():
elif objClass=='Dream.MachineJobShop': elif objClass=='Dream.MachineJobShop':
id=element.get('id', 'not found') id=element.get('id', 'not found')
name=element.get('name', 'not found') name=element.get('name', 'not found')
processingTime=element.get('processingTime', {})
failures=element.get('failures', {}) failures=element.get('failures', {})
failureDistribution=failures.get('distributionType', 'not found') failureDistribution=failures.get('distributionType', 'not found')
MTTF=float(failures.get('MTTF') or 0) MTTF=float(failures.get('MTTF') or 0)
...@@ -437,7 +436,7 @@ def createObjects(): ...@@ -437,7 +436,7 @@ def createObjects():
if(id in repairman.coreObjectIds): if(id in repairman.coreObjectIds):
r=repairman r=repairman
M=MachineJobShop(id, name, 1, processingTime=processingTime, failureDistribution=failureDistribution, M=MachineJobShop(id, name, 1, failureDistribution=failureDistribution,
MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r, MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r,
operatorPool=machineOperatorPoolList, operationType=operationType, operatorPool=machineOperatorPoolList, operationType=operationType,
setupTime=setupTime, setupTime=setupTime,
...@@ -453,7 +452,6 @@ def createObjects(): ...@@ -453,7 +452,6 @@ def createObjects():
elif objClass=='Dream.MachineManagedJob': elif objClass=='Dream.MachineManagedJob':
id=element.get('id', 'not found') id=element.get('id', 'not found')
name=element.get('name', 'not found') name=element.get('name', 'not found')
processingTime=element.get('processingTime', None)
failures=element.get('failures', {}) failures=element.get('failures', {})
failureDistribution=failures.get('distributionType', 'not found') failureDistribution=failures.get('distributionType', 'not found')
MTTF=float(failures.get('MTTF') or 0) MTTF=float(failures.get('MTTF') or 0)
...@@ -490,7 +488,7 @@ def createObjects(): ...@@ -490,7 +488,7 @@ def createObjects():
if(id in repairman.coreObjectIds): if(id in repairman.coreObjectIds):
r=repairman r=repairman
M=MachineManagedJob(id, name, 1, processingTime=processingTime, failureDistribution=failureDistribution, M=MachineManagedJob(id, name, 1, failureDistribution=failureDistribution,
MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r, MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r,
operatorPool=machineOperatorPoolList, operationType=operationType, operatorPool=machineOperatorPoolList, operationType=operationType,
setupTime=setupTime, setupTime=setupTime,
...@@ -737,7 +735,6 @@ def createObjects(): ...@@ -737,7 +735,6 @@ def createObjects():
from MouldAssembly import MouldAssembly from MouldAssembly import MouldAssembly
id=element.get('id', 'not found') id=element.get('id', 'not found')
name=element.get('name', 'not found') name=element.get('name', 'not found')
processingTime=element.get('processingTime', None)
failures=element.get('failures', {}) failures=element.get('failures', {})
failureDistribution=failures.get('distributionType', 'not found') failureDistribution=failures.get('distributionType', 'not found')
MTTF=float(failures.get('MTTF') or 0) MTTF=float(failures.get('MTTF') or 0)
...@@ -771,7 +768,7 @@ def createObjects(): ...@@ -771,7 +768,7 @@ def createObjects():
if(id in repairman.coreObjectIds): if(id in repairman.coreObjectIds):
r=repairman r=repairman
MA=MouldAssembly(id, name, 1, processingTime=processingTime, failureDistribution=failureDistribution, MA=MouldAssembly(id, name, 1, failureDistribution=failureDistribution,
MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r, MTTF=MTTF, MTTR=MTTR, availability=availability, #repairman=r,
operatorPool=machineOperatorPoolList, operationType=operationType, operatorPool=machineOperatorPoolList, operationType=operationType,
setupTime=setupTime, setupTime=setupTime,
......
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