diff --git a/examples/attn_trn/attn.go b/examples/attn_trn/attn.go index 216a7ddc..033b7efe 100644 --- a/examples/attn_trn/attn.go +++ b/examples/attn_trn/attn.go @@ -220,7 +220,7 @@ type Sim struct { KNaAdapt bool `default:"true"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // Path3x3Skp1 *paths.PoolTile `display:"Standard same-to-same size topographic pathway"` @@ -247,7 +247,7 @@ type Sim struct { TestEnv AttnEnv // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // whether to update the network view while running ViewOn bool diff --git a/examples/choose/armaze/maze.go b/examples/choose/armaze/maze.go index 1c228b5f..4bd5bd31 100644 --- a/examples/choose/armaze/maze.go +++ b/examples/choose/armaze/maze.go @@ -52,7 +52,7 @@ type Env struct { Di int `edit:"-"` // configuration parameters - Config Config + Config Config `new-window:"+"` // current drive strength for each of Config.NDrives in normalized // 0-1 units of each drive (beyond built-in curiosity drive) diff --git a/examples/choose/choose.go b/examples/choose/choose.go index 3e9dc80c..7826ac58 100644 --- a/examples/choose/choose.go +++ b/examples/choose/choose.go @@ -71,10 +71,10 @@ var ( type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // if true, stop running at end of a sequence (for NetView Di data parallel index) StopOnSeq bool @@ -83,25 +83,25 @@ type Sim struct { StopOnErr bool // network parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/deep_fsa/deep_fsa.go b/examples/deep_fsa/deep_fsa.go index ec0d25a1..09565ef0 100644 --- a/examples/deep_fsa/deep_fsa.go +++ b/examples/deep_fsa/deep_fsa.go @@ -54,31 +54,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/deep_move/deep_move.go b/examples/deep_move/deep_move.go index 584b2d5c..001c1e00 100644 --- a/examples/deep_move/deep_move.go +++ b/examples/deep_move/deep_move.go @@ -54,31 +54,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/deep_music/deep_music.go b/examples/deep_music/deep_music.go index 19b33410..609bc8c8 100644 --- a/examples/deep_music/deep_music.go +++ b/examples/deep_music/deep_music.go @@ -55,31 +55,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/dls/armaze/maze.go b/examples/dls/armaze/maze.go index 9fea2804..36d67b11 100644 --- a/examples/dls/armaze/maze.go +++ b/examples/dls/armaze/maze.go @@ -57,7 +57,7 @@ type Env struct { Di int `edit:"-"` // configuration parameters - Config Config + Config Config `new-window:"+"` // current drive strength for each of Config.NDrives in normalized 0-1 units of each drive: 0 = first sim drive, not curiosity Drives []float32 diff --git a/examples/dls/dls.go b/examples/dls/dls.go index 0b19af26..9c44bd99 100644 --- a/examples/dls/dls.go +++ b/examples/dls/dls.go @@ -69,10 +69,10 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // if true, stop running at end of a sequence (for NetView Di data parallel index) StopOnSeq bool @@ -81,25 +81,25 @@ type Sim struct { StopOnErr bool // network parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/hip/hip.go b/examples/hip/hip.go index b07efc84..7b3f7c76 100644 --- a/examples/hip/hip.go +++ b/examples/hip/hip.go @@ -62,22 +62,22 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // if true, run in pretrain mode PretrainMode bool @@ -110,13 +110,13 @@ type Sim struct { TestABAC *table.Table `display:"no-inline"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/inhib/inhib.go b/examples/inhib/inhib.go index 2b964c56..de9dc893 100644 --- a/examples/inhib/inhib.go +++ b/examples/inhib/inhib.go @@ -59,31 +59,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // the training patterns to use Pats *table.Table `display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/kinaseq/sim.go b/examples/kinaseq/sim.go index c6652c15..367f1258 100644 --- a/examples/kinaseq/sim.go +++ b/examples/kinaseq/sim.go @@ -48,7 +48,7 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // Kinase NeurCa params NeurCa kinase.NeurCaParams @@ -66,13 +66,13 @@ type Sim struct { TrainData tensor.Float64 // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // logging - Logs elog.Logs `display:"no-inline"` + Logs elog.Logs `new-window:"+"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/mpi/ra25.go b/examples/mpi/ra25.go index 1334946d..e55ee715 100644 --- a/examples/mpi/ra25.go +++ b/examples/mpi/ra25.go @@ -175,34 +175,34 @@ func (cfg *Config) IncludesPtr() *[]string { return &cfg.Includes } type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // network parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // the training patterns to use Pats *table.Table `display:"no-inline"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/neuron/neuron.go b/examples/neuron/neuron.go index 9cf9bd14..3a804c9d 100644 --- a/examples/neuron/neuron.go +++ b/examples/neuron/neuron.go @@ -91,31 +91,31 @@ func (nrn *NeuronEx) Init() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // extra neuron state for additional channels: VGCC, AK NeuronEx NeuronEx `display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // logging - Logs elog.Logs `display:"no-inline"` + Logs elog.Logs `new-window:"+"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // current cycle of updating Cycle int `edit:"-"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/objrec/objrec.go b/examples/objrec/objrec.go index 6f313b47..ad7a656c 100644 --- a/examples/objrec/objrec.go +++ b/examples/objrec/objrec.go @@ -64,31 +64,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/pcore_ds/pcore_ds.go b/examples/pcore_ds/pcore_ds.go index f32becc2..5ae37695 100644 --- a/examples/pcore_ds/pcore_ds.go +++ b/examples/pcore_ds/pcore_ds.go @@ -67,31 +67,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/pcore_vs/pcore_vs.go b/examples/pcore_vs/pcore_vs.go index 7b4bc2b1..62b93975 100644 --- a/examples/pcore_vs/pcore_vs.go +++ b/examples/pcore_vs/pcore_vs.go @@ -64,31 +64,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/pfcmaint/pfcmaint.go b/examples/pfcmaint/pfcmaint.go index 0a555a3e..1acfda13 100644 --- a/examples/pfcmaint/pfcmaint.go +++ b/examples/pfcmaint/pfcmaint.go @@ -58,31 +58,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/pvlv/effort_plot.go b/examples/pvlv/effort_plot.go index 5d02ed19..addb1180 100644 --- a/examples/pvlv/effort_plot.go +++ b/examples/pvlv/effort_plot.go @@ -34,7 +34,7 @@ const LogPrec = 4 type DrEffPlot struct { // context just for plotting - Context axon.Context + Context axon.Context `new-window:"+"` // Rubicon params Rubicon axon.Rubicon diff --git a/examples/pvlv/pvlv.go b/examples/pvlv/pvlv.go index df555f86..1d0bdd84 100644 --- a/examples/pvlv/pvlv.go +++ b/examples/pvlv/pvlv.go @@ -66,31 +66,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/ra25/ra25.go b/examples/ra25/ra25.go index 025bf040..eb422fec 100644 --- a/examples/ra25/ra25.go +++ b/examples/ra25/ra25.go @@ -175,34 +175,34 @@ func (cfg *Config) IncludesPtr() *[]string { return &cfg.Includes } type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // network parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // the training patterns to use Pats *table.Table `display:"no-inline"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/ra25x/ra25x.go b/examples/ra25x/ra25x.go index 9944a930..7cdc1691 100644 --- a/examples/ra25x/ra25x.go +++ b/examples/ra25x/ra25x.go @@ -60,34 +60,34 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // network parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // the training patterns to use Pats *table.Table `display:"no-inline"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/rl/rl.go b/examples/rl/rl.go index 43955c09..fc90ef8f 100644 --- a/examples/rl/rl.go +++ b/examples/rl/rl.go @@ -53,31 +53,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/examples/vspatch/vspatch.go b/examples/vspatch/vspatch.go index 45f36645..c778f48b 100644 --- a/examples/vspatch/vspatch.go +++ b/examples/vspatch/vspatch.go @@ -64,31 +64,31 @@ func main() { type Sim struct { // simulation configuration parameters -- set by .toml config file and / or args - Config Config + Config Config `new-window:"+"` // the network -- click to view / edit parameters for layers, paths, etc - Net *axon.Network `display:"no-inline"` + Net *axon.Network `new-window:"+" display:"no-inline"` // all parameter management - Params emer.NetParams `display:"inline"` + Params emer.NetParams `display:"add-fields"` // contains looper control loops for running sim - Loops *looper.Manager `display:"no-inline"` + Loops *looper.Manager `new-window:"+" display:"no-inline"` // contains computed statistic values - Stats estats.Stats + Stats estats.Stats `new-window:"+"` // Contains all the logs and information about the logs.' - Logs elog.Logs + Logs elog.Logs `new-window:"+"` // Environments - Envs env.Envs `display:"no-inline"` + Envs env.Envs `new-window:"+" display:"no-inline"` // axon timing parameters and state - Context axon.Context + Context axon.Context `new-window:"+"` // netview update parameters - ViewUpdate netview.ViewUpdate `display:"inline"` + ViewUpdate netview.ViewUpdate `display:"add-fields"` // manages all the gui elements GUI egui.GUI `display:"-"` diff --git a/go.mod b/go.mod index 833cffea..93fb9df1 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/emer/axon/v2 go 1.22 require ( - cogentcore.org/core v0.3.3-0.20240819201856-14e5d78556c3 + cogentcore.org/core v0.3.3-0.20240821175244-e58d15222272 github.com/anthonynsimon/bild v0.13.0 - github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240820174009-40d67f5b7c88 + github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240821185300-2fdedc8771da github.com/emer/vision/v2 v2.0.0-dev0.1.0 github.com/goki/vulkan v1.0.8 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index cfcdaa87..55f3f4d0 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cogentcore.org/core v0.3.3-0.20240819201856-14e5d78556c3 h1:MXaUbsB3iyRhdNewiXJrTR4I56w84ktYzZDO81pTZxQ= -cogentcore.org/core v0.3.3-0.20240819201856-14e5d78556c3/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4= +cogentcore.org/core v0.3.3-0.20240821175244-e58d15222272 h1:Rg4+pPgZmyuwdVIPlvInNnub4eF4CN0e6n4vRepfj3M= +cogentcore.org/core v0.3.3-0.20240821175244-e58d15222272/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -34,8 +34,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240820174009-40d67f5b7c88 h1:XpAZVlv6MAq7IbCXvPV0O7D4c+uOQBw4KDXNP2+hkCA= -github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240820174009-40d67f5b7c88/go.mod h1:xSMtRuFkyD27pk5+o9BupztSxz/B2rwVL8AGmTFK/6U= +github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240821185300-2fdedc8771da h1:w8nmwNT7/RdTCHBW1XXBDLLz5hPCcSXMvC79nOHBqcI= +github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240821185300-2fdedc8771da/go.mod h1:RXZ29Mze6HXSxFQ3nFZa1HJy2FgVP2oiUG4s6/l3UUo= github.com/emer/vision/v2 v2.0.0-dev0.1.0 h1:Xt1zRyjYNGw1XEq4e5mvM9/+GOOBRIu1HYVEYmklp+c= github.com/emer/vision/v2 v2.0.0-dev0.1.0/go.mod h1:NjWHbBnHzEEG5CzThQeOz8l/aLp2SROmyyBDIBuRYRc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=