Skip to content

Commit

Permalink
Update dev
Browse files Browse the repository at this point in the history
  • Loading branch information
LongxingTan committed Jun 6, 2023
1 parent 5e57052 commit 61268ab
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ check_dirs := lekin examples tests
style:
black --preview $(check_dirs)
isort $(check_dirs)
flake8
flake8 $(check_dirs)
pre-commit run --all-files

# run tests for the library
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_static/network-backward-algorithm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/source/_static/simple-backward-algorithm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions docs/source/constraints.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ Constraints
subject to:

.. math:: \alpha{}_t(i) = P(O_1, O_2, … O_t, q_t = S_i \lambda{})


22 changes: 22 additions & 0 deletions docs/source/models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,25 @@ SPT—EDD规则
2)计算所有任务的总流程时间。
3)查找方案中,预定交贷期(di)大于总流程时间的生产任务(不惟一),按SPT规则,将其中加工时间最大者排于最后。
4)舍弃第3步能排定的最后任务者及其后序任务,回到第2步重复。


倒排
---------------

- 每一个MO最早开始时间初始化:max(ESD, today)。确保开始时间不早于今天


正排
-------------


禁忌搜索
------------


遗传算法
-------------


强化学习
-------------
2 changes: 1 addition & 1 deletion lekin/solver/construction_heuristics/epst.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
正排"""


class EPST(objective):
class EPST(object):
def __init__(self):
pass

Expand Down
2 changes: 1 addition & 1 deletion lekin/solver/construction_heuristics/lpst.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
倒排"""


class LPST(objective):
class LPST(object):
def __init__(self):
pass

Expand Down
3 changes: 2 additions & 1 deletion lekin/solver/construction_heuristics/spt.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Shortest Processing Time"""

from collections import OrderedDict
from typing import Any, Callable, Dict, List, Optional, Tuple, Union


Expand Down Expand Up @@ -64,7 +65,7 @@ def solve(self, job_list: List, machine_list: List):

del self.time[t]
break
self.time = SortedDict(self.time)
self.time = OrderedDict(self.time)
return self.jobs_list_to_export

def get_waiting_operations(self, job_list, time, machine_list, current_time_on_machines):
Expand Down
2 changes: 1 addition & 1 deletion lekin/solver/meta_heuristics/tabu_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"""


class TabuSearch(obkect):
class TabuSearch(object):
def __init__(self):
pass
1 change: 0 additions & 1 deletion lekin/solver/reinforcement_learning/models/graphcnn.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import torch
import torch.nn as nn
import torch.nn.functional as F
Expand Down
33 changes: 22 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@
max-line-length = 120
show-source = true
ignore =
E203, # space before : (needed for how black formats slicing)
W503, # line break before binary operator
W504, # line break after binary operator
E402, # module level import not at top of file
E731, # do not assign a lambda expression, use a def
E741, # ignore not easy to read variables like i l I etc.
C406, # Unnecessary list literal - rewrite as a dict literal.
C408, # Unnecessary dict call - rewrite as a literal.
C409, # Unnecessary list passed to tuple() - rewrite as a tuple literal.
S001, # found modulo formatter (incorrect picks up mod operations)
F401 # unused imports
# space before : (needed for how black formats slicing)
E203,
# line break before binary operator
W503,
# line break after binary operator
W504,
# module level import not at top of file
E402,
# do not assign a lambda expression, use a def
E731,
# ignore not easy to read variables like i l I etc.
E741,
# Unnecessary list literal - rewrite as a dict literal.
C406,
# Unnecessary dict call - rewrite as a literal.
C408,
# Unnecessary list passed to tuple() - rewrite as a tuple literal.
C409,
# found modulo formatter (incorrect picks up mod operations)
S001,
# unused imports
F401
exclude = docs/build/*.py,
node_modules/*.py,
.eggs/*.py,
Expand Down

0 comments on commit 61268ab

Please sign in to comment.