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
791d75ed
Commit
791d75ed
authored
Jun 13, 2014
by
Georgios Dagkakis
Committed by
Jérome Perrin
Jun 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Topology77 fix
parent
92abb9a7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
dream/simulation/JSONInputs/Topology77.json
dream/simulation/JSONInputs/Topology77.json
+3
-3
dream/tests/dump/Topology77.json.result
dream/tests/dump/Topology77.json.result
+4
-4
No files found.
dream/simulation/JSONInputs/Topology77.json
View file @
791d75ed
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
"capacityRequirementDict"
:
{
"capacityRequirementDict"
:
{
"CS1"
:
100
,
"CS1"
:
100
,
"CS2"
:
50
,
"CS2"
:
50
,
"CS3"
:
10
0
,
"CS3"
:
5
0
,
"CS4"
:
50
"CS4"
:
50
}
}
},
},
...
@@ -144,13 +144,13 @@
...
@@ -144,13 +144,13 @@
{
{
"_class"
:
"Dream.CapacityEntity"
,
"_class"
:
"Dream.CapacityEntity"
,
"capacityProjectId"
:
"P1"
,
"capacityProjectId"
:
"P1"
,
"name"
:
"P1_CNC_
10
0"
,
"name"
:
"P1_CNC_
5
0"
,
"requiredCapacity"
:
50
"requiredCapacity"
:
50
},
},
{
{
"_class"
:
"Dream.CapacityEntity"
,
"_class"
:
"Dream.CapacityEntity"
,
"capacityProjectId"
:
"P2"
,
"capacityProjectId"
:
"P2"
,
"name"
:
"P2_CNC_
5
0"
,
"name"
:
"P2_CNC_
10
0"
,
"requiredCapacity"
:
100
"requiredCapacity"
:
100
}
}
]
]
...
...
dream/tests/dump/Topology77.json.result
View file @
791d75ed
...
@@ -209,15 +209,15 @@
...
@@ -209,15 +209,15 @@
"utilization": 0.0
"utilization": 0.0
},
},
{
{
"P1":
75
.0,
"P1":
100
.0,
"P2": 100.0,
"P2": 100.0,
"period": 3.0,
"period": 3.0,
"utilization": 0.
35
"utilization": 0.
4
}
}
],
],
"detailedWorkPlan": [
"detailedWorkPlan": [
{
{
"allocation":
75
.0,
"allocation":
100
.0,
"operation": "CS4",
"operation": "CS4",
"project": "P1",
"project": "P1",
"time": 3.0
"time": 3.0
...
@@ -229,7 +229,7 @@
...
@@ -229,7 +229,7 @@
"time": 3.0
"time": 3.0
}
}
],
],
"meanUtilization": 0.
0875
"meanUtilization": 0.
1
}
}
},
},
{
{
...
...
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