Skip to content
Snippets Groups Projects
Unverified Commit 229528b2 authored by Björn Ludwig's avatar Björn Ludwig
Browse files

wip(optimize): reduce example to speed up testing

parent 0d2b48fb
No related branches found
No related tags found
No related merge requests found
......@@ -48,8 +48,6 @@ def prepare_costs(
(char == "u" and pos == Pos(Side.LEFT, Mod.NONE, Col.PINKY, Row.HOME))
or (char == "n" and pos == Pos(Side.RIGHT, Mod.NONE, Col.INDEX, Row.HOME))
or (char == "r" and pos == Pos(Side.RIGHT, Mod.NONE, Col.MIDDLE, Row.HOME))
or (char == "t" and pos == Pos(Side.RIGHT, Mod.NONE, Col.RING, Row.HOME))
or (char == "d" and pos == Pos(Side.RIGHT, Mod.NONE, Col.PINKY, Row.HOME))
):
_linear_costs[char, pos] = 0.0
continue
......@@ -57,24 +55,15 @@ def prepare_costs(
for (char, char_2, pos, pos_2) in optimization_problem.quad_char_pos_assigns_keys:
if (
(
char == "u"
and pos == Pos(Side.LEFT, Mod.NONE, Col.PINKY, Row.HOME)
and char_2 == "i"
and pos_2 == Pos(Side.LEFT, Mod.NONE, Col.MIDDLE, Row.HOME)
)
or (
char == "i"
and pos == Pos(Side.LEFT, Mod.NONE, Col.MIDDLE, Row.HOME)
and char_2 == "a"
and pos_2 == Pos(Side.LEFT, Mod.NONE, Col.INDEX, Row.HOME)
)
or (
char == "a"
and pos == Pos(Side.LEFT, Mod.NONE, Col.INDEX, Row.HOME)
and char_2 == "e"
and pos_2 == Pos(Side.LEFT, Mod.NONE, Col.RING, Row.HOME)
)
char == "u"
and pos == Pos(Side.LEFT, Mod.NONE, Col.PINKY, Row.HOME)
and char_2 == "i"
and pos_2 == Pos(Side.LEFT, Mod.NONE, Col.MIDDLE, Row.HOME)
) or (
char == "i"
and pos == Pos(Side.LEFT, Mod.NONE, Col.MIDDLE, Row.HOME)
and char_2 == "a"
and pos_2 == Pos(Side.LEFT, Mod.NONE, Col.INDEX, Row.HOME)
):
_quad_costs[char, char_2, pos, pos_2] = 0.0
continue
......@@ -83,17 +72,14 @@ def prepare_costs(
if __name__ == "__main__":
test_chars = Chars("aeiunrtd")
test_chars = Chars("uiaenr")
test_poss = Positions(
(
Pos(Side.LEFT, Mod.NONE, Col.PINKY, Row.HOME),
Pos(Side.LEFT, Mod.NONE, Col.RING, Row.HOME),
Pos(Side.LEFT, Mod.NONE, Col.MIDDLE, Row.HOME),
Pos(Side.LEFT, Mod.NONE, Col.INDEX, Row.HOME),
Pos(Side.RIGHT, Mod.NONE, Col.INDEX, Row.HOME),
Pos(Side.RIGHT, Mod.NONE, Col.MIDDLE, Row.HOME),
Pos(Side.RIGHT, Mod.NONE, Col.RING, Row.HOME),
Pos(Side.RIGHT, Mod.NONE, Col.PINKY, Row.HOME),
)
)
optimization_model = KeyboardOptimization(test_chars, test_poss.poss)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment