PSSAI_Team/JobShopScheduling
2
0
Fork 1
Code Issues 2 Pull requests Releases Wiki Activity
58 commits 10 branches 0 tags 1.3 MiB
Commit graph

58 commits

This branch
This branch
All branches
Author SHA1 Message Date
maxschlosser dd18b64203 Merge branch 'output' of PSSAI_Team/JobShopScheduling into devel 2017-07-12 17:54:24 +02:00
lukasstracke 22196bdfa6 Merge branch 'simanneal' of PSSAI_Team/JobShopScheduling into devel 2017-07-12 17:51:33 +02:00
lukasstracke d88e5d9e91 Legendary Output, v1.1 2017-07-12 17:50:36 +02:00
lukasstracke be28f9b11f Output 1.0, Beispiel s. example.py 2017-07-12 16:33:53 +02:00
lukasstracke 435291679b Merge branch 'output' of ssh://git.orlives.de:1337/PSSAI_Team/JobShopScheduling into output 2017-07-12 13:51:32 +02:00
Maximilian Schlosser 3a7a8ebcbd Somewhat sensible default parameters, temperature, amount of maximum anneal iterations and generator accept probability passed to anneal. 2017-07-12 04:23:36 +02:00
Maximilian Schlosser 991b7f4175 simulated annealing 2017-07-11 22:25:56 +02:00
Maximilian Schlosser 049e64c675 Magic number is now a default parameter 2017-07-11 13:55:02 +02:00
Maximilian Schlosser 32c99ff075 accept, tighten, generate rewrite (now has magic number describing percentage) 2017-07-11 13:50:51 +02:00
Maximilian Schlosser 304dc401f7 Added matplotlib as requirement 2017-07-11 13:18:14 +02:00
Maximilian Schlosser 6783d91c43 tighten 2017-07-11 12:07:03 +02:00
lukasstracke 6be2e20cc7 Pull_Fwd inkl. Rectify funktionstüchtig TODO: Accept + Simanneal + Output 2017-07-10 23:17:33 +02:00
Maximilian Schlosser a7f1a86748 Some small documentation, hopefully useful 2017-07-10 15:59:00 +02:00
Maximilian Schlosser 85e61f91fb Multiple methods for rectify, merge of mapping. TODO: rectify loop 2017-07-09 18:57:52 +02:00
Maximilian Schlosser 8ed9d800c3 Merge branch 'devel' into simanneal 2017-07-09 18:00:32 +02:00
Trolli Schmittlauch 7d330e9866 Merge branch 'mapping_problem' of PSSAI_Team/JobShopScheduling into devel 2017-07-09 17:20:50 +02:00
Trolli Schmittlauch d96632a336 Merge branch 'mapping_problem_helper' of PSSAI_Team/JobShopScheduling into mapping_problem 2017-07-09 17:20:34 +02:00
Trolli Schmittlauch ae43bd5264 add typing annotations to get_task_by_job 2017-07-09 17:20:07 +02:00
Maximilian Schlosser 4204969da9 helper method to extract single jobs 2017-07-09 13:15:30 +02:00
Trolli Schmittlauch 252f3a824e JobShopProblem is now a Mapping, not a list 
- implementing all interface functions for JobShopProblem to behave like
a Mapping (e.g. dict) with (int, int) keys
this implements and closes #14
 2017-07-08 02:21:30 +02:00
Maximilian Schlosser bd370a1ed5 Put docstrings at the right(?) positions. 2017-07-03 16:11:30 +02:00
Maximilian Schlosser a8c4a11b20 mock() to generate mockenv for the generator, pull_fwd() to compute new solutions. Rectify needs to be implemented before generator works. 2017-07-02 19:32:26 +02:00
Maximilian Schlosser 23e6d12754 enumerate tasks 2017-07-02 14:07:38 +02:00
Maximilian Schlosser 3aed7f52f5 Merge branch 'devel' into simanneal 2017-07-02 13:46:56 +02:00
Trolli Schmittlauch edd413db54 Merge branch 'parser' of PSSAI_Team/JobShopScheduling into devel 2017-06-30 13:19:40 +02:00
Trolli Schmittlauch 4804a2a4d5 adjust __all__ packet imports to new module names 
contributes to #3
 2017-06-30 11:45:50 +02:00
Trolli Schmittlauch 40eaca47ae adjust code style to follow PEP8 2017-06-30 00:51:50 +02:00
Trolli Schmittlauch 3edd920b0d improve type signature of visitor 2017-06-29 22:28:23 +02:00
Trolli Schmittlauch 72e5800604 now *really* renamed functions and modules 
contributes to #3
 2017-06-29 22:23:12 +02:00
Trolli Schmittlauch 92ddb2740e JobShopProblem now a list, renaming module 
contributes to #3
 2017-06-29 21:30:31 +02:00
Maximilian Schlosser e3945ce3dc solve by enumeration 2017-06-29 19:14:24 +02:00
Trolli Schmittlauch ba91f321e2 check plausibility of job/ machine numbers of JobShopProblem 
contributes to #3
 2017-06-28 09:57:49 +02:00
Trolli Schmittlauch 58047569f8 add error handling: parser now throws exceptions 2017-06-28 00:03:14 +02:00
Trolli Schmittlauch c3953449ff improve module 2017-06-27 23:49:52 +02:00
Trolli Schmittlauch 901472e8b5 add function for parsing inputdata strings 2017-06-27 23:47:56 +02:00
Trolli Schmittlauch 252e7d6ee0 jobshop2_parser now works, too 2017-06-27 23:39:32 +02:00
Trolli Schmittlauch 59cf66506f move common code to __init__ 2017-06-27 13:27:56 +02:00
Trolli Schmittlauch eb9ca0ed3c disable debug output 2017-06-26 16:37:20 +02:00
Trolli Schmittlauch 122fdbbb38 remove unnecessary visitor function 2017-06-26 16:36:38 +02:00
Trolli Schmittlauch 6d0f334350 add library parse function for jobshop2 
- clean up problem_data
 2017-06-26 16:28:26 +02:00
Trolli Schmittlauch 8c1d6e12be add library parse function fpr jobshop1 
- also extract common semantic analysis (Visitor) code
 2017-06-26 16:05:49 +02:00
Trolli Schmittlauch 238cbe0e71 successfully parsing jobshop1 to list of JobShopProblem s 2017-06-26 15:19:51 +02:00
Trolli Schmittlauch 28eedd4579 commenting the grammar 2017-06-25 20:40:50 +02:00
Trolli Schmittlauch c62e012c97 grammar now able to match jobshop1 even with preface 2017-06-25 20:25:34 +02:00
Trolli Schmittlauch 632e908f95 moved common grammar to separate file 2017-06-25 00:58:58 +02:00
Trolli Schmittlauch c66e8fe3eb parsimonious not needed anymore 2017-06-24 23:30:24 +02:00
Trolli Schmittlauch 0d1a38caa9 grammar now matches Jobshop1 without prefix 
- grammar matches, but result not yet evaluated
 2017-06-24 23:28:29 +02:00
Trolli Schmittlauch 309664a36a 🎉 successful parsing grammar for jobshop data 
- now using arpeggio as a parsing lib
 2017-06-24 03:17:03 +02:00
Trolli Schmittlauch b89de0e6cb rules now successfully parsed, but too deep recursion 2017-06-22 23:49:44 +02:00
Trolli Schmittlauch 608af7d2ff [untested] first grammar definition with parsimonious 
- added parsimonious as requirement
- first try of creating a grammar for job_shop1
 2017-06-22 23:12:18 +02:00