Skip to content

Locking and user input to algorithm #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Da1NOnlyCheezIt wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Locking and user input to algorithm #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8ba24c
Update keyboardSA.jl
Da1NOnlyCheezIt Dec 15, 2023
f151c8f
Removed the comment line
Da1NOnlyCheezIt Dec 15, 2023
967516e
Another optimization keyboardSA.jl
Da1NOnlyCheezIt Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 101 additions & 15 deletions keyboardSA.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,24 @@ using Base.Threads
using BenchmarkTools
using Statistics

## for new section of code
println("1: default, 2:lock ~0-9, 3:lock all, ~0-9 -+[];',.?")
userLocks = parse(Int, readline())
if userLocks > 3
userLocks = 1
end

println("1: Use ASDF JKL;, 2: Use WASD MKL;, for weird layouts read code")
userLayoutChoice = parse(Int, readline())
if userLayoutChoice > 2
userLayoutChoice = 1
end


## end of new code area

# ~~~ rng ~~~
seed = 123456
seed = Int(floor(time()))
const rng = StableRNGs.LehmerRNG(seed)

# ~~~ data ~~~
Expand All @@ -22,14 +37,8 @@ const distanceEffort = 1 # at 2 distance penalty is squared
const doubleFingerEffort = 1
const doubleHandEffort = 1

const fingerCPM = [223, 169, 225, 273, 343, 313, 259, 241] # how many clicks can you do in a minute
meanCPM = mean(fingerCPM)
stdCPM = std(fingerCPM)
zScoreCPM = -(fingerCPM .- meanCPM) ./ stdCPM # negative since higher is better
const fingerEffort = zScoreCPM .- minimum(zScoreCPM)


const rowCPM = [131, 166, 276, 192]
const rowCPM = [383, 402, 402, 402]
meanCPM = mean(rowCPM)
stdCPM = std(rowCPM)
zScoreCPM = -(rowCPM .- meanCPM) ./ stdCPM # negative since higher is better
Expand Down Expand Up @@ -197,7 +206,73 @@ traditionalLayoutMap = Dict{Int, Tuple{Float64, Float64, Int, Int, Int}}(
45 => (10.75, 1.5, 4, 7, 0),
46 => (11.75, 1.5, 4, 8, 0),
)
# traditional (x, y, row, finger, home)
gamingLayoutMap = Dict{Int, Tuple{Float64, Float64, Int, Int, Int}}(
1 => (0.5, 4.5, 1, 2, 0),
2 => (1.5, 4.5, 1, 2, 0),
3 => (2.5, 4.5, 1, 2, 0),
4 => (3.5, 4.5, 1, 4, 0),
5 => (4.5, 4.5, 1, 4, 0),
6 => (5.5, 4.5, 1, 4, 0),
7 => (6.5, 4.5, 1, 4, 0),
8 => (7.5, 4.5, 1, 5, 0),
9 => (8.5, 4.5, 1, 6, 0),
10 => (9.5, 4.5, 1, 7, 0),
11 => (10.5, 4.5, 1, 8, 0),
12 => (11.5, 4.5, 1, 8, 0),
13 => (12.5, 4.5, 1, 8, 0),

14 => (2, 3.5, 2, 2, 0),
15 => (3, 3.5, 2, 3, 1),
16 => (4, 3.5, 2, 4, 0),
17 => (5, 3.5, 2, 4, 0),
18 => (6, 3.5, 2, 4, 0),
19 => (7, 3.5, 2, 5, 0),
20 => (8, 3.5, 2, 5, 0),
21 => (9, 3.5, 2, 6, 0),
22 => (10, 3.5, 2, 7, 0),
23 => (11, 3.5, 2, 7, 0),
24 => (12, 3.5, 2, 7, 0),
25 => (13, 3.5, 2, 7, 0),

26 => (2.25, 2.5, 3, 2, 1),
27 => (3.25, 2.5, 3, 3, 0),
28 => (4.25, 2.5, 3, 4, 1),
29 => (5.25, 2.5, 3, 4, 0),
30 => (6.25, 2.5, 3, 4, 0),
31 => (7.25, 2.5, 3, 5, 0),
32 => (8.25, 2.5, 3, 5, 0),
33 => (9.25, 2.5, 3, 6, 1),
34 => (10.25, 2.5, 3, 7, 1),
35 => (11.25, 2.5, 3, 7, 0),
36 => (12.25, 2.5, 3, 7, 0),

37 => (2.75, 1.5, 4, 2, 0),
38 => (3.75, 1.5, 4, 3, 0),
39 => (4.75, 1.5, 4, 3, 0),
40 => (5.75, 1.5, 4, 4, 0),
41 => (6.75, 1.5, 4, 4, 0),
42 => (7.75, 1.5, 4, 5, 0),
43 => (8.75, 1.5, 4, 5, 1),
44 => (9.75, 1.5, 4, 5, 0),
45 => (10.75, 1.5, 4, 6, 0),
46 => (11.75, 1.5, 4, 7, 0),
)

## LayoutSelector
if userLayoutChoice == 1
userLayoutMap = traditionalLayoutMap
const fingerCPM = [223, 169, 225, 273, 343, 313, 259, 241] # how many clicks can you do in a minute
elseif userLayoutChoice == 2
userLayoutMap = gamingLayoutMap
const fingerCPM = [366, 402, 384, 402, 402, 414, 420, 366] # how many clicks can you do in a
end
minutemeanCPM = mean(fingerCPM)
stdCPM = std(fingerCPM)
zScoreCPM = -(fingerCPM .- meanCPM) ./ stdCPM # negative since higher is better
const fingerEffort = zScoreCPM .- minimum(zScoreCPM)

##

# comparisons
QWERTYgenome = [
Expand Down Expand Up @@ -396,7 +471,6 @@ const letterList = [
'>',
'?'
]

# map dictionary
const keyMapDict = Dict(
'a' => [1,0], 'A' => [1,1],
Expand Down Expand Up @@ -452,7 +526,7 @@ const handList = [1, 1, 1, 1, 2, 2, 2, 2] # what finger is with which hand
# ### KEYBOARD FUNCTIONS ###
function createGenome()
# setup
myGenome = shuffle(rng, letterList)
myGenome = QWERTYgenome

# return
return myGenome
Expand Down Expand Up @@ -678,30 +752,42 @@ function shuffleGenome(currentGenome, temperature)

# positions of switched letterList
switchedPositions = randperm(rng, 46)[1:noSwitches]
if userLocks == 2
while switchedPositions[1] <= 11 || switchedPositions[2] <= 11
switchedPositions = randperm(rng,46)[1:2]
end
elseif userLocks == 3
# LOL I am sorry this boolean is so unbearably long but it needed to be exact for those pesky lil punctuations
while switchedPositions[1] <= 13 || 23 < switchedPositions[1] < 26 || 34 < switchedPositions[1] < 37 || 43 < switchedPositions[1] || switchedPositions[2] <= 13 || 23 < switchedPositions[2] < 26 || 34 < switchedPositions[2] < 37 || 43 < switchedPositions[2]
switchedPositions = randperm(rng,46)[1:2]
end
end
newPositions = shuffle(rng, copy(switchedPositions))

# create new genome by shuffeling
# create new genome by shuffleing
newGenome = copy(currentGenome)
for i in 1:noSwitches
og = switchedPositions[i]
ne = newPositions[i]

newGenome[og] = currentGenome[ne]

end

# return

return newGenome

end


function runSA(
layoutMap = traditionalLayoutMap;
layoutMap = userLayoutMap;
baselineLayout = QWERTYgenome,
temperature = 500,
epoch = 20,
coolingRate = 0.99,
num_iterations = 25000,
coolingRate = 0.9999,
num_iterations = 500000,
save_current_best = :plot,
verbose = true,
)
Expand Down