# HG changeset patch # User Arne Babenhauserheide # Date 1690372070 -7200 # Wed Jul 26 13:47:50 2023 +0200 # Node ID e44a523b4bfc0f6aea258a06ae9d0e0ddde5526f # Parent 12a28b748e59a5e87024b32f31ac5c2c84cfdd73 include mine in default layouts diff --git a/check_neo.py b/check_neo.py --- a/check_neo.py +++ b/check_neo.py @@ -598,6 +598,8 @@ print_layout_with_statistics(CRY_LAYOUT, letters=letters, repeats=repeats, number_of_letters=datalen1, number_of_bigrams=datalen2, trigrams=trigrams, number_of_trigrams=number_of_trigrams, verbose=verbose, shorten_numbers=True, fingerstats=fingerstats) info("\nAnd Bone") print_layout_with_statistics(BONE_LAYOUT, letters=letters, repeats=repeats, number_of_letters=datalen1, number_of_bigrams=datalen2, trigrams=trigrams, number_of_trigrams=number_of_trigrams, verbose=verbose, shorten_numbers=True, fingerstats=fingerstats) + info("\nAnd Mine") + print_layout_with_statistics(MINE_LAYOUT, letters=letters, repeats=repeats, number_of_letters=datalen1, number_of_bigrams=datalen2, trigrams=trigrams, number_of_trigrams=number_of_trigrams, verbose=verbose, shorten_numbers=True, fingerstats=fingerstats) info("\nAnd Dvorak") print_layout_with_statistics(DVORAK_LAYOUT, letters=letters, repeats=repeats, number_of_letters=datalen1, number_of_bigrams=datalen2, trigrams=trigrams, number_of_trigrams=number_of_trigrams, verbose=verbose, shorten_numbers=True, fingerstats=fingerstats) info("\nAnd Colemak") diff --git a/empirie/mine-bored.txt b/empirie/mine-bored.txt --- a/empirie/mine-bored.txt +++ b/empirie/mine-bored.txt @@ -1,4 +1,4 @@ Mine bored -jluaq wbdgyz -crieo mntshß +jluaq wbdgyzß +crieo mntsh⇘ vxüäö pf,.k diff --git a/layout_base.py b/layout_base.py --- a/layout_base.py +++ b/layout_base.py @@ -227,6 +227,64 @@ ['♕', (), '♔', (' ', ' ', ' ', '0', '\xa0', '\u202f'), '⇙', (), (), '♛']] +MINE_LAYOUT = [[('^', 'ˇ', '↻', '˙', '˞', '̣'), + ('1', '°', '¹', 'ª', '₁', '¬'), + ('2', '§', '²', 'º', '₂', '∨'), + ('3', 'ℓ', '³', '№', '₃', '∧'), + ('4', '»', '›', '', '♀', '⊥'), + ('5', '«', '‹', '·', '♂', '∡'), + ('6', '$', '¢', '£', '⚥', '∥'), + ('7', '€', '¥', '¤', 'ϰ', '→'), + ('8', '„', '‚', '⇥', '⟨', '∞'), + ('9', '“', '‘', ' /', '⟩', '∝'), + ('0', '”', '’', '*', '₀', '∅'), + ('-', '—', '-', '‑', '\xad'), + ('`', '¸', '°', '¨', '', '¯'), + '←'], + ['⇥', + ('j', 'J', '…', '⇞', 'θ', 'Θ'), + ('l', 'L', '_', '⌫', 'λ', 'Λ'), + ('u', 'U', '[', '⇡', '', '⊂'), + ('a', 'A', ']', 'Entf', 'α', '∀'), + ('q', 'Q', '^', '⇟', 'ϕ', 'ℚ'), + ('w', 'W', '!', '¡', 'ω', 'Ω'), + ('b', 'B', '<', '7', 'β', '⇐'), + ('d', 'D', '>', '8', 'δ', 'Δ'), + ('g', 'G', '=', '9', 'γ', 'Γ'), + ('y', 'Y', '&', '+', 'υ', '∇'), + ('z', 'Z', '@', '.', 'ζ', 'ℤ'), + ('ß', 'ẞ', 'ſ', '−', 'ς', '∘'), + ()], + ['⇩', + ('c', 'C', '\\', '⇱', 'χ', 'ℂ'), + ('r', 'R', '/', '⇠', 'ρ', 'ℝ'), + ('i', 'I', '{', '⇣', 'ι', '∫'), + ('e', 'E', '}', '⇢', 'ε', '∃'), + ('o', 'O', '*', '⇲', 'ο', '∈'), + ('m', 'M', '?', '¿', 'μ', '⇔'), + ('n', 'N', '(', '4', 'ν', 'ℕ'), + ('t', 'T', ')', '5', 'τ', '∂'), + ('s', 'S', '-', '6', 'σ', 'Σ'), + ('h', 'H', ':', ',', 'ψ', 'Ψ'), + ('⇘', '', '', '', '', ''), + ('´', '~', '/', '˝', '', '˘'), + '\n'], + ['⇧', + '⇚', + ('v', 'V', '#', '\x1b', '', '√'), + ('x', 'X', '$', '', 'ξ', 'Ξ'), + ('ü', 'Ü', '|', '⎀', '', '∪'), + ('ä', 'Ä', '~', '\n', 'η', 'ℵ'), + ('ö', 'Ö', '`', '↶', 'ϵ', '∩'), + ('p', 'P', '+', ':', 'π', 'Π'), + ('f', 'F', '%', '1', 'φ', 'Φ'), + (',', '–', '"', '2', 'ϱ', '⇒'), + ('.', '•', "'", '3', 'ϑ', '↦'), + ('k', 'K', ';', ';', 'κ', '×'), + '⇗'], + ['♕', (), '♔', (' ', ' ', ' ', '0', '\xa0', '\u202f'), '⇙', (), (), '♛']] + + #NORDTAST_LAYOUT = [ # [("^"),("1"),("2"),("3"),("4"),("5"),("6"),("7"),("8"),("9"),("0"),("ß"),("´"),("←")], # Zahlenreihe (0) # [("⇥"),("ä"),("u"),("o"),("b"),("p"),("k"),("g"),("l"),("m"),("f"),("x"),("+"),()], # Reihe 1 diff --git a/layout_cost.py b/layout_cost.py --- a/layout_cost.py +++ b/layout_cost.py @@ -470,7 +470,7 @@ for finger in fingers: idx = FINGER_NAMES.index(finger) multiplier = intended_balance[idx] - fingers[finger] /= multiplier + fingers[finger] /= multiplier disbalance = std(fingers.values()) return disbalance