Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cpagent/cp_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class CpAgent(SchedulerAgent):
max_optimization_time = SOLVER_TIMEOUT
save_history = False
itinierary_setup = 120
penalize_t_out = False

# solution

Expand Down
3 changes: 3 additions & 0 deletions src/cpagent/objectives.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ def _create_objective(
model.Minimize(sum([
(self.t_in[i] - step['min_t_in'])
* step['ponderation']
+
((self.t_out[i] - step['min_t_out'])
* step['ponderation'] if self.penalize_t_out else 0.)
for i, step in enumerate(self.steps)
]))
22 changes: 22 additions & 0 deletions tests/cpagent/test_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,28 @@ def test_solver_simple(solver, use_case_straight_line_2t):
assert cp_solver.Values(solver.t_out).to_list() == t_out_oracle


@pytest.mark.parametrize("solver", [
CpAgent("ortools")
])
def test_solver_simple_penalize_t_out(solver, use_case_straight_line_2t):
"""Testing solver on a simple use case with
t_out penalization
"""
solver.penalize_t_out = True
cp_solver, _ = solver._solve_from_steps(
use_case_straight_line_2t[0],
use_case_straight_line_2t[1],
use_case_straight_line_2t[2]
)
cp_solver.Values(solver.t_in).to_list()
cost_oracle = 40
t_in_oracle = [0, 10, 10, 30]
t_out_oracle = [10, 30, 30, 40]
assert int(cp_solver.ObjectiveValue()) == cost_oracle
assert cp_solver.Values(solver.t_in).to_list() == t_in_oracle
assert cp_solver.Values(solver.t_out).to_list() == t_out_oracle


@pytest.mark.parametrize("solver", [
CpAgent("ortools")
])
Expand Down