Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
d01e22b5
Commit
d01e22b5
authored
Sep 29, 2014
by
Ioannis Papagiannopoulos
Committed by
Jérome Perrin
Feb 04, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test dums corrected after correction in sortOperators method
parent
9759fb64
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
dream/simulation/OperatorRouter.py
dream/simulation/OperatorRouter.py
+0
-1
dream/tests/dump/JobShopOperationDefiningEntities1.json.result
.../tests/dump/JobShopOperationDefiningEntities1.json.result
+4
-4
dream/tests/dump/Topology43.json.result
dream/tests/dump/Topology43.json.result
+4
-4
dream/tests/dump/requiredPartsConditionalBuffer2.json.result
dream/tests/dump/requiredPartsConditionalBuffer2.json.result
+4
-4
No files found.
dream/simulation/OperatorRouter.py
View file @
d01e22b5
...
@@ -361,7 +361,6 @@ class Router(ObjectInterruption):
...
@@ -361,7 +361,6 @@ class Router(ObjectInterruption):
op
.
waitingTime
=
self
.
env
.
now
-
op
.
schedule
[
-
1
][
-
1
]
op
.
waitingTime
=
self
.
env
.
now
-
op
.
schedule
[
-
1
][
-
1
]
elif
self
.
env
.
now
>
0
:
elif
self
.
env
.
now
>
0
:
op
.
waitingTime
=
self
.
env
.
now
op
.
waitingTime
=
self
.
env
.
now
print
'before'
,
[[
x
.
id
,
x
.
waitingTime
]
for
x
in
self
.
candidateOperators
]
self
.
candidateOperators
.
sort
(
key
=
lambda
x
:
x
.
waitingTime
,
reverse
=
True
)
self
.
candidateOperators
.
sort
(
key
=
lambda
x
:
x
.
waitingTime
,
reverse
=
True
)
#===========================================================================
#===========================================================================
...
...
dream/tests/dump/JobShopOperationDefiningEntities1.json.result
View file @
d01e22b5
...
@@ -90,8 +90,8 @@
...
@@ -90,8 +90,8 @@
"family": "Operator",
"family": "Operator",
"id": "O1",
"id": "O1",
"results": {
"results": {
"waiting_ratio":
100.0
,
"waiting_ratio":
66.66666666666667
,
"working_ratio":
0.0
"working_ratio":
33.333333333333336
}
}
},
},
{
{
...
@@ -99,8 +99,8 @@
...
@@ -99,8 +99,8 @@
"family": "Operator",
"family": "Operator",
"id": "O2",
"id": "O2",
"results": {
"results": {
"waiting_ratio":
50.0
,
"waiting_ratio":
83.33333333333333
,
"working_ratio":
50.0
"working_ratio":
16.666666666666668
}
}
},
},
{
{
...
...
dream/tests/dump/Topology43.json.result
View file @
d01e22b5
...
@@ -87,8 +87,8 @@
...
@@ -87,8 +87,8 @@
"family": "Operator",
"family": "Operator",
"id": "O1",
"id": "O1",
"results": {
"results": {
"waiting_ratio":
10
0.0,
"waiting_ratio":
5
0.0,
"working_ratio": 0.0
"working_ratio":
5
0.0
}
}
},
},
{
{
...
@@ -96,8 +96,8 @@
...
@@ -96,8 +96,8 @@
"family": "Operator",
"family": "Operator",
"id": "O2",
"id": "O2",
"results": {
"results": {
"waiting_ratio": 0.0,
"waiting_ratio":
5
0.0,
"working_ratio":
10
0.0
"working_ratio":
5
0.0
}
}
},
},
{
{
...
...
dream/tests/dump/requiredPartsConditionalBuffer2.json.result
View file @
d01e22b5
...
@@ -264,8 +264,8 @@
...
@@ -264,8 +264,8 @@
"family": "Operator",
"family": "Operator",
"id": "O1",
"id": "O1",
"results": {
"results": {
"waiting_ratio": 6
8.7
5,
"waiting_ratio": 6
2.
5,
"working_ratio": 3
1.2
5
"working_ratio": 3
7.
5
}
}
},
},
{
{
...
@@ -273,8 +273,8 @@
...
@@ -273,8 +273,8 @@
"family": "Operator",
"family": "Operator",
"id": "O2",
"id": "O2",
"results": {
"results": {
"waiting_ratio":
25.0
,
"waiting_ratio":
31.25
,
"working_ratio":
75.0
"working_ratio":
68.75
}
}
},
},
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment