Skip to content

Commit

Permalink
saving good params for choose model and renaming prjns -> paths for p…
Browse files Browse the repository at this point in the history 
…arams_good
  • Loading branch information
@rcoreilly
rcoreilly committed Jun 3, 2024
1 parent 3281091 commit f86daf0
Show file tree
Hide file tree
Showing 45 changed files with 2,695 additions and 1,425 deletions.
2 changes: 1 addition & 1 deletion examples/choose/configs/01_us_magnitude.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

NDrives = 3
Paradigm = "GroupGoodBad"
USMagRange.Min = 0.5 # 0.4 gives reasonable diff
USMagRange.Min = 0.2 # 0.4 gives reasonable diff
USMagRange.Max = 1

2 changes: 1 addition & 1 deletion examples/choose/configs/02_us_probability.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

NDrives = 3
Paradigm = "GroupGoodBad"
USProbRange.Min = 0.8 # 0.8 = good intermediate results
USProbRange.Min = 0.9 # 0.8 = good intermediate results
USProbRange.Max = 1

2 changes: 1 addition & 1 deletion examples/choose/configs/04_effort.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
NDrives = 3
Paradigm = "GroupGoodBad"
EffortRange.Min = 1
EffortRange.Max = 4
EffortRange.Max = 8
20 changes: 5 additions & 15 deletions examples/choose/params_good/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Debug = false
OpenWts = ''

[Env]
Config = ''
Config = '01_us_magnitude.toml'
NDrives = 4
PctCortexStEpc = 10
PctCortexStEpc = 50
PctCortexNEpc = 1
PctCortex = 0.0
SameSeed = false
Expand All @@ -20,27 +20,17 @@ OpenWts = ''
Good = true

[Run]
GPU = true
NData = 16
GPU = false
NData = 8
NThreads = 0
Run = 0
NRuns = 5
NEpochs = 100
NEpochs = 50
NTrials = 128
NCycles = 300
PCAInterval = 10

[Log]
AggStats = [
'Rew_R',
'DA_R',
'RewPred_R',
'VtaDA',
'PVposEst',
'PVnegEst',
'PVposVar',
'PVnegVar'
]
SaveWts = false
Epoch = true
Run = true
Expand Down
27 changes: 20 additions & 7 deletions examples/choose/params_good/params.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,27 +202,40 @@
Sel = ".BLAExtToAcq"
Desc = ""
[Base.Params]
"Path.PathScale.Abs" = "2"
"Path.PathScale.Abs" = "1"

[[Base]]
Sel = ".CSToBLApos"
Desc = ""
[Base.Params]
"Path.Learn.LRate.Base" = "0.01"

[[Base]]
Sel = ".PFCToVSMtx"
Desc = "contextual, should be weaker"
[Base.Params]
"Path.PathScale.Abs" = "1"
"Path.PathScale.Rel" = "0.1"

[[Base]]
Sel = ".VSPatchPath"
Desc = ""
Sel = "#OFCposToVMtxGo"
Desc = "specific best go signal"
[Base.Params]
"Path.Learn.LRate.Base" = "0.02"
"Path.Learn.Trace.LearnThr" = "0"
"Path.PathScale.Abs" = "4"
"Path.PathScale.Abs" = "3"

[[Base]]
Sel = "#ILposToVMtxGo"
Desc = "specific best go signal"
[Base.Params]
"Path.PathScale.Abs" = "3"

[[Base]]
Sel = "#CSToBLAposAcqD1"
Sel = ".VSPatchPath"
Desc = ""
[Base.Params]
"Path.Learn.LRate.Base" = "0.02"
"Path.Learn.Trace.LearnThr" = "0"
"Path.PathScale.Abs" = "4"

[[Base]]
Sel = ".CSToBLANovelInhib"
Expand Down
42 changes: 21 additions & 21 deletions examples/choose/params_good/params_all.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ Act: {
PopCode: { On: false Ge: 0.1 Min: -0.1 Max: 1.1 MinAct: 1 MinSigma: 0.1 MaxSigma: 0.1 Clip: true }
}
Inhib: {
ActAvg: { Nominal: 0.02 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
ActAvg: { Nominal: 0.025 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
Layer: { On: false Gi: 0.5 FB: 0 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
Pool: { On: true Gi: 0.5 FB: 0 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
}
Expand Down Expand Up @@ -1919,7 +1919,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 3
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -1943,7 +1943,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 3
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -1967,7 +1967,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -1991,7 +1991,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2015,7 +2015,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2039,7 +2039,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand Down Expand Up @@ -2086,7 +2086,7 @@ Act: {
PopCode: { On: false Ge: 0.1 Min: -0.1 Max: 1.1 MinAct: 1 MinSigma: 0.1 MaxSigma: 0.1 Clip: true }
}
Inhib: {
ActAvg: { Nominal: 0.02 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
ActAvg: { Nominal: 0.025 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
Layer: { On: false Gi: 0.5 FB: 0 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
Pool: { On: true Gi: 0.5 FB: 0 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
}
Expand Down Expand Up @@ -2130,7 +2130,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand Down Expand Up @@ -2250,7 +2250,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2274,7 +2274,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2298,7 +2298,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2322,7 +2322,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2346,7 +2346,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand All @@ -2370,7 +2370,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 1.5
Rel: 0.1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: false }
Expand Down Expand Up @@ -2972,7 +2972,7 @@ Com: {
GType: InhibitoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 1 Abs: 2
Rel: 1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.8 Var: 0 Sym: true }
Expand Down Expand Up @@ -3035,7 +3035,7 @@ Com: {
GType: ExcitatoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 0.1 Abs: 3
Rel: 0.1 Abs: 2.9
}
SWt: {
Init: { SPct: 0 Mean: 0.5 Var: 0.4 Sym: true }
Expand Down Expand Up @@ -3089,7 +3089,7 @@ SWt: {
}
Learn: {
Learn: true
LRate: { Base: 0.02 Sched: 1 Mod: 1 Eff: 0.02 }
LRate: { Base: 0.01 Sched: 1 Mod: 1 Eff: 0.01 }
Trace: { Tau: 1 SubMean: 0 LearnThr: 0 }
KinaseCa: { SpikeG: 12 MaxISI: 100 Dt: { MTau: 5 PTau: 39 DTau: 41 ExpAdj: true
} }
Expand Down Expand Up @@ -3398,7 +3398,7 @@ Com: {
GType: InhibitoryG Delay: 2 MaxDelay: 2 PFail: 0 PFailSWt: false DelLen: 3
}
PathScale: {
Rel: 1 Abs: 2
Rel: 1 Abs: 1
}
SWt: {
Init: { SPct: 0 Mean: 0.8 Var: 0 Sym: true }
Expand Down Expand Up @@ -8635,7 +8635,7 @@ Act: {
PopCode: { On: false Ge: 0.1 Min: -0.1 Max: 1.1 MinAct: 1 MinSigma: 0.1 MaxSigma: 0.1 Clip: true }
}
Inhib: {
ActAvg: { Nominal: 0.04 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
ActAvg: { Nominal: 0.05333333 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
Layer: { On: true Gi: 0.9 FB: 1 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
Pool: { On: false Gi: 0.9 FB: 1 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
}
Expand Down Expand Up @@ -8678,7 +8678,7 @@ Act: {
PopCode: { On: false Ge: 0.1 Min: -0.1 Max: 1.1 MinAct: 1 MinSigma: 0.1 MaxSigma: 0.1 Clip: true }
}
Inhib: {
ActAvg: { Nominal: 0.04 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
ActAvg: { Nominal: 0.05333333 AdaptGi: false Offset: 0 HiTol: 0 LoTol: 0.8 AdaptRate: 0.1 }
Layer: { On: true Gi: 1 FB: 1 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
Pool: { On: false Gi: 1 FB: 1 FSTau: 6 SS: 30 SSfTau: 20 SSiTau: 50 FS0: 0.1 FFAvgTau: 50 FFPrv: 0 ClampExtMin: 0.05 }
}
Expand Down
8 changes: 4 additions & 4 deletions examples/choose/params_good/params_layers.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
VSTN Nominal: 0.15
Layer.Gi: 0.50

VMtxGo Nominal: 0.02
VMtxGo Nominal: 0.03
Pool.Gi: 0.50 Params: .VSMatrixLayer: 0.5

VMtxNo Nominal: 0.02
VMtxNo Nominal: 0.03
Pool.Gi: 0.50 Params: .VSMatrixLayer: 0.5

VSGated Nominal: 0.50
Expand Down Expand Up @@ -215,10 +215,10 @@
PLutilPTp Nominal: 0.10 Params: .PTPredLayer: 0.1
Layer.Gi: 0.80

CS Nominal: 0.04 Params: .CS: 0.1
CS Nominal: 0.05 Params: .CS: 0.1
Layer.Gi: 0.90

CSP Nominal: 0.04 Params: .CS: 0.1
CSP Nominal: 0.05 Params: .CS: 0.1
Layer.Gi: 1.00

Dist Nominal: 0.10
Expand Down
Loading

0 comments on commit f86daf0

Please sign in to comment.