Commits · master · Julian Scherzer / psco-2019-gp

Sep 17, 2019
- Update README.md · d9d45f10
  Florian Heinrichs authored 5 years ago
  
  d9d45f10
- Update README.md · c0461dc8
  Florian Heinrichs authored 5 years ago
  
  c0461dc8
Aug 28, 2019
- Update README.md · cfad3b92
  Florian Heinrichs authored 5 years ago
  
  cfad3b92
Jul 29, 2019
- delete to big graphs · 54f3ee46
  Florian Heinrichs authored 5 years ago
  
  54f3ee46
- Merge branch 'fix_fa' into 'master' · 380a2c26
  Florian Heinrichs authored 5 years ago
```
fixing endlessloop and visting more nodes than gp

See merge request !14
```
  380a2c26
- fixing endlessloop and visting more nodes than gp · b66c72cd
  Florian Heinrichs authored 5 years ago
  
  b66c72cd
Jul 26, 2019
- Update benchmark · c3380169
  p-hamann authored 5 years ago
  
  c3380169
Jul 25, 2019
- Merge branch 'master' of gitlab.informatik.hu-berlin.de:scherzej/psco-2019-gp · dd78a9fa
  Florian Heinrichs authored 5 years ago
  
  dd78a9fa
- found and fixed bug in gp · ee1a10e6
  Florian Heinrichs authored 5 years ago
  
  ee1a10e6
- Merge branch 'ek_reimplementation' into 'master' · 1793cac1
  Florian Heinrichs authored 5 years ago
```
Update edmonds karp implementation

See merge request !13
```
  1793cac1
- Update edmonds karp implementation · 66c7de50
  p-hamann authored 5 years ago
  
  66c7de50
Jul 22, 2019
- Update benchmark · 9c13b932
  p-hamann authored 5 years ago
  
  9c13b932
- Merge branch 'optimizations' into 'master' · 4c11b687
  Florian Heinrichs authored 5 years ago
```
Optimizations

See merge request !12
```
  4c11b687
- Delete conflict marker · 6e746fa1
  p-hamann authored 5 years ago
  
  6e746fa1
- Fix IBFS fault · ec6ba426
  p-hamann authored 5 years ago
  
  ec6ba426
- Update cerr output · 430d86ba
  p-hamann authored 5 years ago
  
  430d86ba
- Update datatype of visited_nodes from int to unsigned long · 8a407d28
  p-hamann authored 5 years ago
  
  8a407d28
- Enable branching after degree · 6492fe9b
  p-hamann authored 5 years ago
  
  6492fe9b
- Merge branch 'forced_assignments' into 'master' · e6684386
  Patrick Hamann authored 5 years ago
```
Forced assignments

See merge request !11
```
  e6684386
- Update bnb.cpp · 71be98e8
  Florian Heinrichs authored 5 years ago
  
  71be98e8
Jul 21, 2019
- Fix memory blow up · 9171b1e6
  p-hamann authored 5 years ago
  
  9171b1e6
- fix gp_.reset call in bnb · eb47ea45
  Florian Heinrichs authored 5 years ago
  
  eb47ea45
- Update execute_gp.sh · 9b882d53
  Florian Heinrichs authored 5 years ago
  
  9b882d53
- Update execute_fa.sh · a732fb35
  Florian Heinrichs authored 5 years ago
  
  a732fb35
- Rebase fa with master · ef04d7e0
  Florian Heinrichs authored 5 years ago
```
Merge branch 'forced_assignments' of gitlab.informatik.hu-berlin.de:scherzej/psco-2019-gp into forced_assignments
```
  ef04d7e0
- script for fa · e18f47d7
  Florian Heinrichs authored 5 years ago
  
  e18f47d7
- fixed fa, added fa as new lb option · ac2cbffb
  Florian Heinrichs authored 5 years ago
  
  ac2cbffb
- forced assignments · 3b50461d
  Florian Heinrichs authored 5 years ago
  
  3b50461d
- script for fa · 350ef221
  Florian Heinrichs authored 5 years ago
  
  350ef221
- fixed fa, added fa as new lb option · 9d419194
  Florian Heinrichs authored 5 years ago
  
  9d419194
- Merge branch 'perf_optimization' into 'master' · 59aacf98
  Florian Heinrichs authored 5 years ago
```
Perf optimization

See merge request !9
```
  59aacf98
- Merge branch 'master' into 'perf_optimization' · b843e8aa
  Florian Heinrichs authored 5 years ago
```
# Conflicts:
#   bnb/bnb.cpp
#   bnb/greedy_packing.cpp
```
  b843e8aa
Jul 02, 2019
- Optimize greedy packing and incremental bfs · 416afc86
  p-hamann authored 5 years ago
  
  416afc86
- Optimize edmonds karp · 256a20d3
  p-hamann authored 5 years ago
  
  256a20d3
- Optimize greedy packing · 156a8359
  p-hamann authored 5 years ago
  
  156a8359
- Optimize ibfs · 8644dfc6
  p-hamann authored 5 years ago
  
  8644dfc6
Jul 01, 2019
- forced assignments · e0048326
  Florian Heinrichs authored 5 years ago
  
  e0048326
Jun 26, 2019
- fixed correctness of gp · 0e7ef525
  Florian Heinrichs authored 5 years ago
  
  0e7ef525
- fixed correctness of gp · aa444594
  Florian Heinrichs authored 5 years ago
  
  aa444594
Jun 24, 2019
- benchmark-script for gp · e3afda30
  Florian Heinrichs authored 5 years ago
  
  e3afda30