Switch to Subcortex.

Author: c0gent

Cargo.lock

@@ -4,7 +4,8 @@ extern crate time;
 extern crate vibi;
 
 use vibi::{window, config};
-use vibi::bismit::flywheel::Flywheel;
+use vibi::bismit::{Cortex, Flywheel, Subcortex, InputGenerator};
+// use vibi::bismit::subcortex::{};
 
 
 fn main() {
@@ -20,8 +21,25 @@ fn main() {
     let (response_tx, response_rx) = mpsc::channel();
 
     let th_flywheel = thread::Builder::new().name("flywheel".to_string()).spawn(move || {
-        let mut flywheel = Flywheel::from_blueprint(config::define_lm_schemes(),
-            config::define_a_schemes(), Some(config::ca_settings()), command_rx, "v1");
+        // let mut flywheel = Flywheel::from_blueprint(config::define_lm_schemes(),
+        //     config::define_a_schemes(), Some(config::ca_settings()), command_rx, "v1");
+        // let cortex = Cortex::builder(config::define_lm_schemes(), config::define_a_schemes())
+        //     .ca_settings(config::ca_settings())
+        //     .build().unwrap();
+        let layer_map_schemes = config::define_lm_schemes();
+        let area_schemes = config::define_a_schemes();
+
+        let input_gen = InputGenerator::new(&layer_map_schemes[&area_schemes["v0"].layer_map_name()],
+            &area_schemes["v0"]).unwrap();
+        let subcortex = Subcortex::new().nucleus(input_gen);
+
+        let cortex = Cortex::builder(layer_map_schemes, area_schemes)
+            .ca_settings(config::ca_settings())
+            .sub(subcortex)
+            .build().unwrap();
+
+        let mut flywheel = Flywheel::new(cortex, command_rx, "v1");
+
         flywheel.add_req_res_pair(request_rx, response_tx);
         flywheel.spin();
     }).expect("Error creating 'flywheel' thread");

examples/glyph_seq_FIXME.rs renamed to examples/glyph_seq.rs_FIXME

@@ -76,7 +76,8 @@ pub fn define_a_schemes() -> AreaSchemeList {
 
     AreaSchemeList::new()
         // .area_ext("v0", "v0_lm", ENCODE_SIZE,
-        //     EncoderScheme::GlyphSequences { seq_lens: (5, 5), seq_count: 10, scale: 1.4, hrz_dims: (16, 16) },
+        //     EncoderScheme::GlyphSequences { seq_lens: (5, 5), seq_count: 10,
+        //    scale: 1.4, hrz_dims: (16, 16) },
         //     None,
         //     None,
         // )

examples/motor.rs renamed to examples/motor.rs_FIXME

@@ -138,7 +138,12 @@ impl CycleLoop {
     pub fn run(autorun_iters: u32, control_rx: Receiver<CyCtl>, mut result_tx: Sender<CyRes>,
                 lm_schemes: LayerMapSchemeList, a_schemes: AreaSchemeList,
                 ca_settings: Option<CorticalAreaSettings>, area_name: String) -> bool {
-        let cortex = Cortex::new(lm_schemes, a_schemes, ca_settings);
+        let mut builder = Cortex::builder(lm_schemes, a_schemes);
+        if let Some(ca_settings) = ca_settings {
+            builder = builder.ca_settings(ca_settings);
+        }
+
+        let cortex = builder.build().unwrap();
         // config::disable_stuff(&mut cortex);
 
         // let area_name = "m1".to_owned();

examples/scalar_sdr.rs renamed to examples/scalar_sdr.rs_FIXME

@@ -5,7 +5,7 @@ use glium::backend::glutin_backend::{GlutinFacade};
 use glium::{self, Surface, Program, DrawParameters, VertexBuffer, IndexBuffer};
 // use glium::glutin::{ElementState, MouseButton};
 // use vecmath;
-use enamel::MouseState;
+// use enamel::MouseState;
 use bismit::flywheel::AreaInfo;
 use bismit::map::SliceTractMap;
 use window::HexGridBuffer;