Skip to content

Commit

Permalink
Change method names between across and within
Browse files Browse the repository at this point in the history
I do dumb things sometimes.
  • Loading branch information
tdmittens committed Apr 8, 2021
1 parent ef7e143 commit 08ed4de
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 3 deletions.
Binary file modified python/__pycache__/calculations.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/distance_algo.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/distance_calc.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/gui.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/layout.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/order_division.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/order_lines.cpython-37.pyc
Binary file not shown.
Binary file modified python/__pycache__/space_allocation.cpython-37.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion python/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def evaluationFile(randomD, coiD, weightD, abcHD, abcVD, exportPath):
abcv_df = pd.DataFrame(abcVD)

alldf = [random_df, coi_df, weight_df, abch_df, abcv_df]
names = ["random", "coi", "weight", "abc horiz", "abc verti"]
names = ["random", "coi", "weight", "across aisle", "within aisle"]
sumDist = []

for i in range(len(alldf)):
Expand Down
4 changes: 2 additions & 2 deletions python/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def layoutDistance(layout_df):
return locations_df


def orderByVertical(locationDistance, aisles):
def orderByHorizontal(locationDistance, aisles): #across aisle
locationDistance = locationDistance.sort_values(
by=['Column', 'Row'], ascending=False)
returnFrame = pd.DataFrame()
Expand All @@ -67,7 +67,7 @@ def orderByVertical(locationDistance, aisles):
return returnFrame


def orderByHorizontal(locationDistance, aisles):
def orderByVertical(locationDistance, aisles): #within aisle
# sort by aisle, then by row, starting from bottom and working to the top
returnFrame = locationDistance.sort_values(
by=['Column', 'Row'], ascending=False)
Expand Down

0 comments on commit 08ed4de

Please sign in to comment.