OSDN Git Service
Yordan Manolov [Sun, 19 Jul 2020 14:00:11 +0000 (16:00 +0200)]
reverted split parser to original, gabm now has the modified version also called by ep parser
Yordan Manolov [Sun, 19 Jul 2020 13:58:43 +0000 (15:58 +0200)]
reverted split parser to original, gabm now has the modified version also called by ep parser
Moritz [Sun, 19 Jul 2020 13:15:53 +0000 (15:15 +0200)]
Correct my name in all copyrights (Dederichs) and added Janos as Copyright to all files created while implementing split model (including the outputs generated from split model)
Yordan Manolov [Sun, 19 Jul 2020 11:51:12 +0000 (13:51 +0200)]
trigger WIP issue flag
Yordan Manolov [Sun, 19 Jul 2020 11:28:52 +0000 (13:28 +0200)]
implemented parsing optimization
Yordan Manolov [Sun, 19 Jul 2020 10:02:48 +0000 (12:02 +0200)]
Merge branch '34-copyright-info' into 'master'
Resolve "Copyright info"
Closes #34
See merge request yordan.manolov/or_project_inform!35
Yordan Manolov [Sun, 19 Jul 2020 10:01:38 +0000 (12:01 +0200)]
Update setup.py
Yordan Manolov [Sun, 19 Jul 2020 10:00:41 +0000 (12:00 +0200)]
Update draw_packing_instructions.py
Yordan Manolov [Sun, 19 Jul 2020 10:00:03 +0000 (12:00 +0200)]
Update draw_3D_packing_instructions.py
Yordan Manolov [Sun, 19 Jul 2020 09:58:59 +0000 (11:58 +0200)]
Update create_packing_instructions.py
Yordan Manolov [Sun, 19 Jul 2020 09:58:29 +0000 (11:58 +0200)]
Update create_gabm_packing_instructions.py
Yordan Manolov [Sun, 19 Jul 2020 09:57:46 +0000 (11:57 +0200)]
Update calculate_gabm_packing_statistics.py
Yordan Manolov [Sun, 19 Jul 2020 09:57:02 +0000 (11:57 +0200)]
Update parse_split_solution_to_pfsp.py
Yordan Manolov [Sun, 19 Jul 2020 09:56:45 +0000 (11:56 +0200)]
Update parse_generated_csv.py
Yordan Manolov [Sun, 19 Jul 2020 09:56:04 +0000 (11:56 +0200)]
Update parse_ep_solution_to_pfsp.py
Yordan Manolov [Sun, 19 Jul 2020 09:55:33 +0000 (11:55 +0200)]
Update parse_boxes.py
Yordan Manolov [Sun, 19 Jul 2020 09:54:48 +0000 (11:54 +0200)]
Update peak_filling_slice_push_heuristic.py
Yordan Manolov [Sun, 19 Jul 2020 09:53:17 +0000 (11:53 +0200)]
Update place_items_in_box.py
Yordan Manolov [Sun, 19 Jul 2020 09:52:29 +0000 (11:52 +0200)]
Update genetic_algorithm.py
Yordan Manolov [Sun, 19 Jul 2020 09:51:41 +0000 (11:51 +0200)]
Update best_match_heuristic.py
Yordan Manolov [Sun, 19 Jul 2020 09:50:36 +0000 (11:50 +0200)]
Update assign_items_by_volume.py
Yordan Manolov [Sun, 19 Jul 2020 09:50:04 +0000 (11:50 +0200)]
Update item.py
Yordan Manolov [Sun, 19 Jul 2020 09:49:31 +0000 (11:49 +0200)]
Update ems.py
Yordan Manolov [Sun, 19 Jul 2020 09:49:12 +0000 (11:49 +0200)]
Update chromosome.py
Yordan Manolov [Sun, 19 Jul 2020 09:47:15 +0000 (11:47 +0200)]
Update split_model_pfsp.py
Yordan Manolov [Sun, 19 Jul 2020 09:46:53 +0000 (11:46 +0200)]
Update split_model.py
Yordan Manolov [Sun, 19 Jul 2020 09:44:21 +0000 (11:44 +0200)]
Update Generator.py
Yordan Manolov [Sun, 19 Jul 2020 09:42:34 +0000 (11:42 +0200)]
Update Generator.py
Yordan Manolov [Sun, 19 Jul 2020 09:24:30 +0000 (11:24 +0200)]
Merge branch '37-delete-obsolete-files-and-folders' into 'master'
Resolve "Delete obsolete files and folders"
Closes #37
See merge request yordan.manolov/or_project_inform!34
Yordan Manolov [Sun, 19 Jul 2020 09:12:42 +0000 (11:12 +0200)]
Update .gitlab-ci.yml
Yordan Manolov [Sun, 19 Jul 2020 09:09:31 +0000 (11:09 +0200)]
Delete benchmark.py
Benchmarking done via runners
Yordan Manolov [Sun, 19 Jul 2020 09:08:57 +0000 (11:08 +0200)]
Update installation instructions for README.md
Yordan Manolov [Sun, 19 Jul 2020 09:03:23 +0000 (11:03 +0200)]
Delete CONTRIBUTING.md final presentation over
Yordan Manolov [Sun, 19 Jul 2020 09:02:38 +0000 (11:02 +0200)]
Delete INSTALL.md Superseded by README
Yordan Manolov [Sun, 19 Jul 2020 09:02:09 +0000 (11:02 +0200)]
Delete Generator_test.py Initially implemented to suppress pytest warning, but never used
Yordan Manolov [Sun, 19 Jul 2020 09:01:29 +0000 (11:01 +0200)]
Delete split_model.py
Yordan Manolov [Sun, 19 Jul 2020 09:01:22 +0000 (11:01 +0200)]
Delete generator_parser.py
Yordan Manolov [Sun, 19 Jul 2020 09:01:14 +0000 (11:01 +0200)]
Delete __init__.py
Yordan Manolov [Sun, 19 Jul 2020 09:01:07 +0000 (11:01 +0200)]
Delete general_model.py
Yordan Manolov [Sun, 19 Jul 2020 08:58:52 +0000 (10:58 +0200)]
Delete ep_bad_case.png deleted presentation already
Yordan Manolov [Sun, 19 Jul 2020 08:58:07 +0000 (10:58 +0200)]
Delete presentation20200716.tex Final presentation was done using M$ Office
Moritz [Sat, 18 Jul 2020 15:29:37 +0000 (17:29 +0200)]
Unified output of all heuristics and connected all heuristics to Peak-Filling Slice Push. Added installation wheel file to installation folder
Moritz [Thu, 16 Jul 2020 18:54:55 +0000 (20:54 +0200)]
Merge branch 'master' of git.rwth-aachen.de:yordan.manolov/or_project_inform
Moritz Dederichs [Thu, 16 Jul 2020 12:56:25 +0000 (14:56 +0200)]
Merge branch 'presentation_final' into 'master'
Presentation final
See merge request yordan.manolov/or_project_inform!33
Moritz Dederichs [Thu, 16 Jul 2020 12:56:15 +0000 (14:56 +0200)]
Merge branch 'master' into 'presentation_final'
# Conflicts:
# src/inform-runner/run_ep_heuristic.py
Yordan Manolov [Thu, 16 Jul 2020 12:39:43 +0000 (14:39 +0200)]
Merge branch '26-documentation' into 'master'
Akshay | Readme documenation step
Closes #26
See merge request yordan.manolov/or_project_inform!32
Janos Piddubnij [Thu, 16 Jul 2020 10:47:25 +0000 (12:47 +0200)]
updated slides
Janos Piddubnij [Thu, 16 Jul 2020 09:53:02 +0000 (11:53 +0200)]
pdf
Janos Piddubnij [Thu, 16 Jul 2020 09:47:08 +0000 (11:47 +0200)]
presentation update
Luca Koczula [Thu, 16 Jul 2020 08:18:05 +0000 (10:18 +0200)]
Updated .pptx file
Luca Koczula [Thu, 16 Jul 2020 08:17:52 +0000 (10:17 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Thu, 16 Jul 2020 07:37:39 +0000 (09:37 +0200)]
Updated presentation .pdf file
Luca Koczula [Thu, 16 Jul 2020 07:37:25 +0000 (09:37 +0200)]
Updated .pptx file
Luca Koczula [Thu, 16 Jul 2020 07:37:10 +0000 (09:37 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Thu, 16 Jul 2020 07:37:04 +0000 (09:37 +0200)]
Delete ORFinalPresentation.pdf
Luca Koczula [Thu, 16 Jul 2020 07:23:57 +0000 (09:23 +0200)]
Updated presentation .pdf file
Luca Koczula [Thu, 16 Jul 2020 07:23:41 +0000 (09:23 +0200)]
Updated .pptx file
Luca Koczula [Thu, 16 Jul 2020 07:23:24 +0000 (09:23 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Thu, 16 Jul 2020 07:23:14 +0000 (09:23 +0200)]
Delete ORFinalPresentation.pdf
Tobias Wagner [Wed, 15 Jul 2020 21:54:43 +0000 (23:54 +0200)]
Upload .pdf file (including the backup slides)
Tobias Wagner [Wed, 15 Jul 2020 21:54:05 +0000 (23:54 +0200)]
Upload updated .pdf file
Tobias Wagner [Wed, 15 Jul 2020 21:34:57 +0000 (23:34 +0200)]
Delete ORFinalPresentation.pptx
Tobias Wagner [Wed, 15 Jul 2020 21:34:35 +0000 (23:34 +0200)]
Delete ORFinalPresentation.pdf
Luca Koczula [Wed, 15 Jul 2020 21:12:56 +0000 (23:12 +0200)]
Presentation .pdf file
Luca Koczula [Wed, 15 Jul 2020 21:12:40 +0000 (23:12 +0200)]
Updated .pptx file
Luca Koczula [Wed, 15 Jul 2020 21:12:23 +0000 (23:12 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 21:11:51 +0000 (23:11 +0200)]
Delete ORFinalPresentation.pdf
Luca Koczula [Wed, 15 Jul 2020 21:11:38 +0000 (23:11 +0200)]
Presentation .pdf file
Luca Koczula [Wed, 15 Jul 2020 21:11:19 +0000 (23:11 +0200)]
Updated PPTX file
Luca Koczula [Wed, 15 Jul 2020 21:11:03 +0000 (23:11 +0200)]
Delete ORFinalPresentation.pdf
Luca Koczula [Wed, 15 Jul 2020 21:10:47 +0000 (23:10 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 21:03:12 +0000 (23:03 +0200)]
Updated Presentation in PDF format
Luca Koczula [Wed, 15 Jul 2020 21:02:44 +0000 (23:02 +0200)]
Updated PPTX file
Luca Koczula [Wed, 15 Jul 2020 20:59:27 +0000 (22:59 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 16:25:58 +0000 (18:25 +0200)]
Updated PPTX file
Luca Koczula [Wed, 15 Jul 2020 16:25:47 +0000 (18:25 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 16:21:01 +0000 (18:21 +0200)]
Updated PPTX file
Luca Koczula [Wed, 15 Jul 2020 16:20:37 +0000 (18:20 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 15:40:19 +0000 (17:40 +0200)]
Updated PPTX file
Luca Koczula [Wed, 15 Jul 2020 15:40:05 +0000 (17:40 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Wed, 15 Jul 2020 14:47:46 +0000 (16:47 +0200)]
Updated PPTX file.
Luca Koczula [Wed, 15 Jul 2020 14:47:14 +0000 (16:47 +0200)]
Delete ORFinalPresentation.pptx
Yordan Manolov [Wed, 15 Jul 2020 10:18:16 +0000 (12:18 +0200)]
Acknowledgements update
Luca Koczula [Wed, 15 Jul 2020 06:55:50 +0000 (08:55 +0200)]
Update README.md
Luca Koczula [Wed, 15 Jul 2020 06:54:30 +0000 (08:54 +0200)]
Update README.md
Luca Koczula [Wed, 15 Jul 2020 06:53:10 +0000 (08:53 +0200)]
Added Info regarding the output
Luca Koczula [Wed, 15 Jul 2020 06:39:42 +0000 (08:39 +0200)]
Update README.md
Luca Koczula [Wed, 15 Jul 2020 06:38:28 +0000 (08:38 +0200)]
Update README.md
Luca Koczula [Wed, 15 Jul 2020 06:38:06 +0000 (08:38 +0200)]
Update README.md
aresblues [Tue, 14 Jul 2020 23:50:48 +0000 (01:50 +0200)]
Akshay | Readme documenation step
Luca Koczula [Tue, 14 Jul 2020 21:58:43 +0000 (23:58 +0200)]
Updated PPTX file
Luca Koczula [Tue, 14 Jul 2020 21:58:27 +0000 (23:58 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Tue, 14 Jul 2020 20:34:58 +0000 (22:34 +0200)]
Updated PPTX file
Luca Koczula [Tue, 14 Jul 2020 20:34:44 +0000 (22:34 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Tue, 14 Jul 2020 20:30:06 +0000 (22:30 +0200)]
Updated PPTX file
Luca Koczula [Tue, 14 Jul 2020 20:29:44 +0000 (22:29 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Tue, 14 Jul 2020 16:39:10 +0000 (18:39 +0200)]
Updated PPTX File
Luca Koczula [Tue, 14 Jul 2020 16:37:46 +0000 (18:37 +0200)]
Delete ORFinalPresentation.pptx
Luca Koczula [Tue, 14 Jul 2020 15:34:12 +0000 (17:34 +0200)]
Updated PPTX File
Luca Koczula [Tue, 14 Jul 2020 15:13:35 +0000 (17:13 +0200)]
Delete ORFinalPresentation.pptx