x/terracotta
Code Issues Proposed changes

Fixed build_constraint

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-25 15:48:42 +11:00
parent 24976cd726
commit dfe9754e4c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neat/locals/overload/mhod/nlp.py
View File

@ -75,10 +75,11 @@ def build_constraint(otf, migration_time, ls, state_vector,
:rtype: tuple(function, function, number)
"""
def constraint(*m):
m_list = list(m)
return float(migration_time +
time_in_state_n +
ls[-1](state_vector, p, m)) / \
ls[-1](state_vector, p, m_list)) / \
(migration_time +
time_in_states +
sum(l(state_vector, p, m) for l in ls))
sum(l(state_vector, p, m_list) for l in ls))
return (constraint, operator.le, otf)

2
tests/locals/overload/mhod/test_nlp.py
View File

@ -52,7 +52,7 @@ class Nlp(TestCase):
[0.3, -0.3]]
m1 = mock('m1')
m2 = mock('m2')
m = (m1, m2)
m = [m1, m2]
container = mock('function container')
expect(container).l0(state_vector, p, m).and_return(2).once()
expect(container).l1(state_vector, p, m). \