From 6d879bf59d329aa41daa2a9bafc735ce58a82990 Mon Sep 17 00:00:00 2001
From: Panos Barlas <panagiotis.barlas@ul.ie>
Date: Fri, 27 Mar 2015 16:22:46 +0000
Subject: [PATCH] Scripts are modified
---
dream/plugins/JobShopKE.py | 3 +++
dream/plugins/UpdateStationList.py | 3 ++-
dream/plugins/plugin.py | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dream/plugins/JobShopKE.py b/dream/plugins/JobShopKE.py
index 0fe08115..de7308d3 100644
--- a/dream/plugins/JobShopKE.py
+++ b/dream/plugins/JobShopKE.py
@@ -14,6 +14,9 @@ class JobShopKE(plugin.InputPreparationPlugin):
def preprocess(self, data):
from dream.KnowledgeExtraction.PilotCases.JobShop.DataExtraction import DataExtraction
receivedData = DataExtraction("C:\Users\Panos\Documents\DB_Approach\JobShop")
+ outputJSONString=json.dumps(receivedData, indent=True)
+ outputJSONFile=open('dataFromSQL.json', mode='w')
+ outputJSONFile.write(outputJSONString)
data['input']['BOM'] = receivedData
return data
diff --git a/dream/plugins/UpdateStationList.py b/dream/plugins/UpdateStationList.py
index 61eb93ac..deadd054 100644
--- a/dream/plugins/UpdateStationList.py
+++ b/dream/plugins/UpdateStationList.py
@@ -51,7 +51,7 @@ class UpdateStationList(plugin.InputPreparationPlugin):
self.data = data
orders = data["input"].get("BOM",{}).get("productionOrders",{})
try:
- stations = data["input"]["BOM"]['stations']
+ stations = data["input"]["BOM"]['stations1']
except:
stations = self.getStationNames()
nodes = data["graph"]["node"]
@@ -66,6 +66,7 @@ class UpdateStationList(plugin.InputPreparationPlugin):
step["technology"] = technology
technologyStations = []
for station in stations:
+ station = station.replace(" ", "").split("-")[0]
for initials in self.getStationInitials(technology):
if station.startswith(initials)\
and data["graph"]["node"][station]["_class"] in self.STATION_CLASS_SET:
diff --git a/dream/plugins/plugin.py b/dream/plugins/plugin.py
index 76c00dd2..d194ecdb 100644
--- a/dream/plugins/plugin.py
+++ b/dream/plugins/plugin.py
@@ -160,7 +160,8 @@ class PluginRegistry(object):
outputJSONString=json.dumps(data, indent=5)
outputJSONFile=open('sentToManPy.json', mode='w')
outputJSONFile.write(outputJSONString)
-
+
+
data = self.execution_plugin.run(data)
for output_preparation in self.output_preparation_list:
--
2.30.9