Commit 45f06659 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

test dumps updated after mouldAssembly rename

Conflicts:
	dream/tests/dump/Topology39.json.result
	dream/tests/dump/Topology40.json.result
	dream/tests/dump/Topology41.json.result
	dream/tests/dump/Topology56.json.result
	dream/tests/dump/Topology57.json.result
	dream/tests/dump/Topology58.json.result
	dream/tests/dump/Topology59.json.result
	dream/tests/dump/Topology61.json.result
	dream/tests/dump/Topology62.json.result
	dream/tests/dump/Topology66.json.result
	dream/tests/dump/Topology67.json.result
	dream/tests/dump/Topology68.json.result
	dream/tests/dump/Topology70.json.result
	dream/tests/dump/Topology71.json.result
	dream/tests/dump/Topology72.json.result
	dream/tests/dump/Topology73.json.result
parent 8c9a118d
......@@ -78,7 +78,7 @@ class Job(Entity): # inherits from the Entity c
# TODO : check if there is a need for setting a different 'type' for the MouldAssembly than 'Machine'
# ask Georgios if the method __class__.__name__ of finding the class type of the last step is correct
# if the entity is of type orderComponent and the last step in it's schedule is Assembly
elif self.type=='OrderComponent' and self.schedule[-1][0].__class__.__name__=='MouldAssembly':
elif self.type=='OrderComponent' and self.schedule[-1][0].__class__.__name__=='MouldAssemblyManaged':
json['results']['completionTime']=self.schedule[-1][1]
completionTime=self.schedule[-1][1]
#else input "still in progress"
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
......@@ -2,7 +2,7 @@
"_class": "Dream.Simulation",
"elementList": [
{
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"family": "Buffer",
"id": "AB1",
"results": {}
......
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