Merge branch 'forced_assignments' into 'master' (e6684386) · Commits · Julian Scherzer / psco-2019-gp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

psco-2019-gp
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

e6684386

Commit e6684386 authored 5 years ago by

Patrick Hamann

Downloads
- Plain Diff

Merge branch 'forced_assignments' into 'master'

Forced assignments

See merge request !11

parents 59aacf98 71be98e8

1 merge request!11Forced assignments

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

benchmark/execute_fa.sh 25 additions, 0 deletions

benchmark/execute_fa.sh
benchmark/execute_gp.sh 1 addition, 1 deletion

benchmark/execute_gp.sh
bnb/bnb.cpp 22 additions, 23 deletions

bnb/bnb.cpp
bnb/greedy_packing.cpp 101 additions, 9 deletions

bnb/greedy_packing.cpp
bnb/ibfs_subtree.cpp 1 addition, 0 deletions

bnb/ibfs_subtree.cpp
bnb/main.cpp 2 additions, 0 deletions

bnb/main.cpp
include/gp-bnb/bnb.hpp 2 additions, 1 deletion

include/gp-bnb/bnb.hpp
include/gp-bnb/greedy_packing.hpp 30 additions, 6 deletions

include/gp-bnb/greedy_packing.hpp

with 184 additions and 40 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment