sim-ballena 0.1.0__tar.gz → 0.1.2__tar.gz

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/Cargo.lock

@@ -4,9 +4,11 @@ version = 4
 
 [[package]]
 name = "SimBallenaSNN"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "pyo3",
+ "rand",
+ "rand_distr",
 ]
 
 [[package]]
@@ -15,6 +17,24 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -36,6 +56,12 @@ version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -45,6 +71,16 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -57,6 +93,15 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.105"
@@ -136,6 +181,51 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_distr"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -170,3 +260,38 @@ name = "unindent"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dafd85c832c1b68bbb4ec0c72c7f6f4fc5179627d2bc7c26b30e4c0cc11e76cc"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cb7e4e8436d9db52fbd6625dbf2f45243ab84994a72882ec8227b99e72b439a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "SimBallenaSNN"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,3 +10,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = "0.27.0"
+rand = "0.9.2"
+rand_distr = "0.5.1"

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sim_ballena
-Version: 0.1.0
+Version: 0.1.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

sim_ballena-0.1.2/src/instances.rs

@@ -0,0 +1,132 @@
+use pyo3::prelude::*;
+use pyo3::exceptions::PyValueError;
+use crate::utils::vec_of_tuples;
+use rand_distr::{Exp, Distribution};
+
+/* ================ */
+/* === INSTANCE === */
+/* ================ */
+
+#[pyclass]
+pub struct Instance{
+    spikes: Vec<(f64,usize)>
+}
+
+#[pymethods]
+impl Instance{
+    #[new]
+    fn new(obj: &Bound<'_,PyAny>)->PyResult<Self>{
+        let mut spikes = match vec_of_tuples::<f64>(obj){
+            Ok(v)  => v,
+            Err(e) => return Err(e)
+        };
+
+        spikes.sort_by(|a,b|a.0.partial_cmp(&b.0).unwrap());
+
+        Ok(Self{spikes})
+    }
+
+    fn __str__(&self)->String{
+        format!("Input(count={})",self.spikes.len())
+    }
+
+    fn __repr__(&self)->String{
+        self.__str__()
+    }
+
+    pub fn get(&self)->&Vec<(f64,usize)>{
+        &self.spikes
+    }
+}
+
+impl Instance{
+    pub fn from_poisson(spikes:Vec<(f64,usize)>)->Self{
+        Self{spikes}
+    }
+}
+
+/* ================= */
+/* ==== POISSON ==== */
+/* ================= */
+
+#[pyclass]
+pub struct PoissonGenerator{
+    max_time    : f64,
+    spike_times : Vec<Vec<f64>>,
+}
+
+#[pymethods]
+impl PoissonGenerator{
+    #[new]
+    fn new(rates: Vec<f64>, max_time:f64)->Self{
+        let mut spike_times:Vec<Vec<f64>> = Vec::new();
+        for rate in rates{
+            spike_times.push( Self::poisson_process(rate, max_time)  );
+        }
+        Self{max_time, spike_times}
+    }
+
+    fn to_instance(&self)->Instance{
+        let mut all_spikes:Vec<(f64,usize)> = Vec::new();
+        for (ch,spikes) in self.spike_times.iter().enumerate(){
+            let instance_view:Vec<(f64,usize)> = spikes.iter().map(|t|(*t,ch)).collect();
+            all_spikes.extend( instance_view );
+        }
+        Instance::from_poisson( all_spikes )
+    }
+
+    fn get_spikes(&self)->Vec<Vec<f64>>{
+        self.spike_times.clone()
+    }
+
+    fn concat<'py>(mut this:PyRefMut<'py, Self>, other:&PoissonGenerator)->PyResult<PyRefMut<'py,Self>>{
+        
+        // check both generators have same dimentions
+        let mut spikes_other = other.get_spikes();
+        if spikes_other.len() != this.spike_times.len(){
+            return Err(PyValueError::new_err("PoissonGenerator must have the same number of inputs"))
+        }
+        // offset
+        for ch in spikes_other.iter_mut(){
+            for spk in ch.iter_mut(){
+                *spk += this.max_time;
+            }
+        }
+        // concat
+        for ch_idx in 0..spikes_other.len(){
+            this.spike_times[ch_idx].extend( spikes_other[ch_idx].clone() );
+        }
+        this.max_time += other.get_max_time();
+        Ok(this)
+    }
+
+    fn __str__(&self)->String{
+        format!("PoissonGenerator(n_inputs:{}, max_time:{})", self.spike_times.len(), self.max_time)
+    }
+
+    fn __repr__(&self)->String{
+        self.__str__()
+    }
+
+}
+
+impl PoissonGenerator{
+    fn poisson_process(rate:f64, max_time:f64)->Vec<f64>{
+        let mut rng = rand::rng();
+        let poi = Exp::new(rate).unwrap();
+
+        let mut spikes:Vec<f64> = Vec::new();
+        let mut t = poi.sample( &mut rng );
+        while t<max_time{
+            spikes.push(t);
+            t += poi.sample( &mut rng );
+        }
+        spikes
+    }
+
+    pub fn get_max_time(&self)->f64{
+        self.max_time
+    }
+
+
+}

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/src/lib.rs

@@ -14,6 +14,7 @@ fn sim_ballena(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<neurons::Lif>()?;
     m.add_class::<networks::Network>()?;
     m.add_class::<instances::Instance>()?;
+    m.add_class::<instances::PoissonGenerator>()?;
     // m.add_function( wrap_pyfunction!(networks::network,m)? )?;
 
     Ok(())

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/src/networks.rs

@@ -268,6 +268,10 @@ impl Network{
         simulate(self, instance, max_time)
     }
 
+    /* ===================== */
+    /*      COPY GETTERS     */
+    /* ===================== */
+
 }
 
 

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/src/neurons.rs

@@ -160,6 +160,7 @@ impl Lif{
 
     /* reset state */
     pub fn reset_state(&mut self){
-        self.voltage         = self.v_rest;
+        self.voltage    = self.v_rest;
+        self.last_spike = None;
     }
 }

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/src/simulation.rs

@@ -142,7 +142,7 @@ pub fn simulate(network:&mut Network, instance: PyRef<'_, Instance>, max_time:f6
             Some(syn) => syn,
             None      => continue
         };
-        
+
         // Only save measures if the event has been procceced 
         // and the neuron changed and needs to be tracked
         let mut track_voltage  : HashSet<usize> = HashSet::new();
@@ -226,22 +226,6 @@ pub fn simulate(network:&mut Network, instance: PyRef<'_, Instance>, max_time:f6
                        .v_rest_list( v_rest_list )
                        .tau_list( tau_list );
 
-
-    // voltages
-    // let neurons = network.get_neurons();
-    // let voltage_markers:Vec<Vec<VoltageMarker>>  = outputs.iter().map(|&o|neurons.get(o).unwrap().get_voltage_markers()).collect();
-
-
-    // let mut res = Response::new( outputs.clone() );
-    // res.set_max_time(max_time);
-    // res.set_voltage_markers(voltage_markers);
-    // res.set_tau_list( tau_list );
-    // res.set_v_rest_list( v_rest_list );
-
-    // spikes
-    // let spikes:Vec<Vec<f64>> = outputs.iter().map(|&o|neurons.get(o).unwrap().get_spikes()).collect();
-    // res.set_spikes( spikes );
-
     // reset all neuron states
     for neu in neurons{{
         neu.reset_state();

sim_ballena-0.1.2/test_file.py

@@ -0,0 +1,49 @@
+import sim_ballena as ballena
+import matplotlib.pyplot as plt
+
+
+net = (ballena.Network( ballena.Lif().tau(5).t_refractory(0).repeat(2) )
+       .synapses_net([])
+       .weights_net([])
+       .outputs([0,1])
+       .mode(['VOLTAGES','SPIKES']))
+
+
+
+# ==========
+#   STEP 1
+# ==========
+net = net.synapses_in([(0,0),(0,1),(1,0),(1,1)])
+net = net.weights_in([16,0,-16,0])
+
+times = [ (1, 0), (5, 1) ]
+instance = ballena.Instance( times )
+res = net.simulate( instance, 10 )
+
+time = res.time()
+volt = res.voltages() 
+plt.figure(figsize=(10,4))
+plt.subplot(121)
+plt.plot( time, volt[0], label='true')
+plt.subplot(122)
+plt.plot( time, volt[1], label='false')
+plt.show()
+
+# ==========
+#   STEP 1
+# ==========
+net = net.weights_in([16,0,-16,0])
+
+times = [ (1, 0), (5, 1) ]
+instance = ballena.Instance( times )
+res = net.simulate( instance, 10 )
+
+time = res.time()
+volt = res.voltages() 
+plt.figure(figsize=(10,4))
+plt.subplot(121)
+plt.plot( time, volt[0], label='true')
+plt.subplot(122)
+plt.plot( time, volt[1], label='false')
+plt.show()
+

{sim_ballena-0.1.0 → sim_ballena-0.1.2}/tests.ipynb

@@ -2,21 +2,43 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "\n",
+      "              -- N E S T --\n",
+      "  Copyright (C) 2004 The NEST Initiative\n",
+      "\n",
+      " Version: 3.9.0\n",
+      " Built: Sep 26 2025 04:43:22\n",
+      "\n",
+      " This program is provided AS IS and comes with\n",
+      " NO WARRANTY. See the file LICENSE for details.\n",
+      "\n",
+      " Problems or suggestions?\n",
+      "   Visit https://www.nest-simulator.org\n",
+      "\n",
+      " Type 'nest.help()' to find out more about NEST.\n",
+      "\n"
+     ]
+    }
+   ],
    "source": [
     "import nest\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
     "import sim_ballena as ballena\n",
     "import time\n",
-    "import numpy as np"
+    "import numpy as np\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -35,7 +57,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -101,7 +123,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -127,7 +149,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -183,50 +205,73 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 6,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<Instance at 0x74fcd1e09380>"
-      ]
-     },
-     "execution_count": 21,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "inputs = spike_generator(100,0.01,100)\n",
-    "inputs = ballena.Instance( inputs )\n",
-    "inputs"
+    "# inputs = spike_generator(100,0.01,100)\n",
+    "\n",
+    "# t_ballena = simulate_ballena_fast(inputs, w=4, tau=4, max_time=100, epochs=5000)\n",
+    "# t_nest    = simulate_nest_fast(inputs, w=4, tau=4, max_time=100, epochs=5000)\n",
+    "\n",
+    "# print('t_ballena', t_ballena)\n",
+    "# print('t_nest', t_nest)\n",
+    "# print(f'ballena es {t_nest/t_ballena} veces mas rapido')"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
+   "outputs": [],
+   "source": [
+    "poisson = ballena.PoissonGenerator( [200,100,50], 0.05 )"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "t_ballena 0.7835497856140137\n",
-      "t_nest 7.289111375808716\n",
-      "ballena es 9.302678029701386 veces mas rapido\n"
+      "[11, 3, 1]\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "[]"
+      ]
+     },
+     "execution_count": 8,
+     "metadata": {},
+     "output_type": "execute_result"
+    },
+    {
+     "data": {
+      "image/png": "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juLi4hM4EQCQSpK/Z6SpqSlGjx6d4q0BgJNM3ndGDh48GK+//nrn12+88UY0NTXFGWecEePGjYtly5bFW2+9Fffdd19ERKxcuTImTJgQ5513XnzwwQdxzz33xNNPPx2///3ve+8sAIB+K+8Y2bZtW1xyySWdXy9dujQiIhYsWBDr1q2Lffv2xe7duztfb29vj5tuuineeuutGDZsWHzxi1+Mp556qsv3AAAGr+N6gPVEOdoHYACAk8fR/vz2b9MAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUaAfu299o9i/K2bYvytm+K99o8G7QxwLE6W/3fFCACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAklXeMPPvss3H55ZdHZWVlFBQUxMaNG494zObNm+OCCy6I4uLiOPvss2PdunXHMCoAMBDlHSOHDh2K6urqWLVq1VGtf+ONN2LOnDlxySWXRFNTU9x4441x3XXXxZNPPpn3sADAwFOY7wGzZ8+O2bNnH/X61atXx4QJE2LFihUREXHOOefEc889F3feeWfMmjUr37cHAAaYPn9mpLGxMWpra7vsmzVrVjQ2NvZ4TFtbW+RyuS4bADAw9XmMNDc3R3l5eZd95eXlkcvl4v333+/2mLq6uigrK+vcqqqq+npMACCRk/LTNMuWLYvW1tbObc+ePalHAgD6SN7PjOSroqIiWlpauuxraWmJ0tLSOPXUU7s9pri4OIqLi/t6NADgJNDnd0ZqamqioaGhy776+vqoqanp67cGAPqBvGPk4MGD0dTUFE1NTRHx74/uNjU1xe7duyPi33/EMn/+/M71119/ffz973+P73znO/Hqq6/GL37xi3jggQfi29/+du+cAQDQr+UdI9u2bYspU6bElClTIiJi6dKlMWXKlLj99tsjImLfvn2dYRIRMWHChNi0aVPU19dHdXV1rFixIu655x4f6wUAIuIYnhmZOXNmZFnW4+vd/e2qM2fOjB07duT7VgDAIHBSfpoGABg8xAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEiqIMuyLPUQR5LL5aKsrCxaW1ujtLQ09TgAwFE42p/f7owAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQ1DHFyKpVq2L8+PFRUlIS06dPj61bt/a4dt26dVFQUNBlKykpOeaBAYCBJe8Y2bBhQyxdujSWL18eL774YlRXV8esWbNi//79PR5TWloa+/bt69x27dp1XEMDAANH3jFyxx13xKJFi2LhwoVx7rnnxurVq2PYsGGxdu3aHo8pKCiIioqKzq28vPy4hgYABo68YqS9vT22b98etbW1//kGQ4ZEbW1tNDY29njcwYMH46yzzoqqqqr42te+Fi+//PKnvk9bW1vkcrkuGwAwMOUVI++8804cPnz4E3c2ysvLo7m5udtjvvCFL8TatWvj0Ucfjd/85jfR0dERF198cbz55ps9vk9dXV2UlZV1blVVVfmMCQD0I33+aZqampqYP39+TJ48OWbMmBEPP/xwfPazn43/+7//6/GYZcuWRWtra+e2Z8+evh4TAEikMJ/FI0eOjKFDh0ZLS0uX/S0tLVFRUXFU3+OUU06JKVOmxOuvv97jmuLi4iguLs5nNACgn8rrzkhRUVFMnTo1GhoaOvd1dHREQ0ND1NTUHNX3OHz4cLz00ksxevTo/CYFAAakvO6MREQsXbo0FixYEBdeeGFMmzYtVq5cGYcOHYqFCxdGRMT8+fNjzJgxUVdXFxERP/jBD+Kiiy6Ks88+O9599934yU9+Ert27Yrrrruud88EAOiX8o6Rq666Kt5+++24/fbbo7m5OSZPnhxPPPFE50Otu3fvjiFD/nPD5V//+lcsWrQompub4/TTT4+pU6fGli1b4txzz+29swAA+q2CLMuy1EMcSS6Xi7KysmhtbY3S0tLU4wAAR+Fof377t2kAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSGrQx8l77RzH+1k0x/tZN8V77R6nH6XSyzpWP/z2Hvj6nT/v+3b02EP4bc2yO9tr7fySNwfjffTCec3cGbYwAACcHMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABISowAAEmJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEjqmGJk1apVMX78+CgpKYnp06fH1q1bP3X9gw8+GBMnToySkpKYNGlSPP7448c0LAAw8OQdIxs2bIilS5fG8uXL48UXX4zq6uqYNWtW7N+/v9v1W7Zsiauvvjquvfba2LFjR8ydOzfmzp0bO3fuPO7hAYD+L+8YueOOO2LRokWxcOHCOPfcc2P16tUxbNiwWLt2bbfr77rrrrjsssvi5ptvjnPOOSd++MMfxgUXXBA///nPj3t4AKD/yytG2tvbY/v27VFbW/ufbzBkSNTW1kZjY2O3xzQ2NnZZHxExa9asHtdHRLS1tUUul+uyAQADU14x8s4778Thw4ejvLy8y/7y8vJobm7u9pjm5ua81kdE1NXVRVlZWedWVVWVz5gAQD9yUn6aZtmyZdHa2tq57dmzJ/VIAEAfKcxn8ciRI2Po0KHR0tLSZX9LS0tUVFR0e0xFRUVe6yMiiouLo7i4OJ/RAIB+Kq87I0VFRTF16tRoaGjo3NfR0RENDQ1RU1PT7TE1NTVd1kdE1NfX97geABhc8rozEhGxdOnSWLBgQVx44YUxbdq0WLlyZRw6dCgWLlwYERHz58+PMWPGRF1dXURE3HDDDTFjxoxYsWJFzJkzJ9avXx/btm2LNWvW9O6ZAAD9Ut4xctVVV8Xbb78dt99+ezQ3N8fkyZPjiSee6HxIdffu3TFkyH9uuFx88cVx//33x2233Rbf/e5343Of+1xs3Lgxzj///N47CwCg38o7RiIilixZEkuWLOn2tc2bN39i37x582LevHnH8lYAwAB3Un6aBgAYPMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFJiBABIqiDLsiz1EEeSy+WirKwsWltbo7S0NPU4AMBRONqf3+6MAABJiREAICkxAgAkJUYAgKTECACQlBgBAJISIwBAUmIEAEhKjAAASYkRACApMQIAJCVGAICkxAgAkJQYAQCSEiMAQFKFqQc4GlmWRURELpdLPAkAcLQ+/rn98c/xnvSLGDlw4EBERFRVVSWeBADI14EDB6KsrKzH1wuyI+XKSaCjoyP27t0bw4cPj4KCgtTj8D9yuVxUVVXFnj17orS0NPU4fArXqv9wrfoP16pnWZbFgQMHorKyMoYM6fnJkH5xZ2TIkCExduzY1GNwBKWlpX4h9hOuVf/hWvUfrlX3Pu2OyMc8wAoAJCVGAICkxAjHrbi4OJYvXx7FxcWpR+EIXKv+w7XqP1yr49cvHmAFAAYud0YAgKTECACQlBgBAJISIwBAUmKEbq1atSrGjx8fJSUlMX369Ni6deunrn/wwQdj4sSJUVJSEpMmTYrHH3+8y+sPP/xwXHrppXHmmWdGQUFBNDU19eH0g0tvXqsPP/wwbrnllpg0aVKcdtppUVlZGfPnz4+9e/f29WkMCr396+p73/teTJw4MU477bQ4/fTTo7a2Nv70pz/15SkMGr19rf7b9ddfHwUFBbFy5cpenrofy+B/rF+/PisqKsrWrl2bvfzyy9miRYuyESNGZC0tLd2uf/7557OhQ4dmP/7xj7NXXnklu+2227JTTjkle+mllzrX3Hfffdn3v//97Je//GUWEdmOHTtO0NkMbL19rd59992strY227BhQ/bqq69mjY2N2bRp07KpU6eeyNMakPri19Vvf/vbrL6+Pvvb3/6W7dy5M7v22muz0tLSbP/+/SfqtAakvrhWH3v44Yez6urqrLKyMrvzzjv7+Ez6DzHCJ0ybNi1bvHhx59eHDx/OKisrs7q6um7XX3nlldmcOXO67Js+fXr2zW9+8xNr33jjDTHSi/ryWn1s69atWURku3bt6p2hB6kTca1aW1uziMieeuqp3hl6kOqra/Xmm29mY8aMyXbu3JmdddZZYuS/+GMaumhvb4/t27dHbW1t574hQ4ZEbW1tNDY2dntMY2Njl/UREbNmzepxPb3jRF2r1tbWKCgoiBEjRvTK3IPRibhW7e3tsWbNmigrK4vq6ureG36Q6atr1dHREddcc03cfPPNcd555/XN8P2YGKGLd955Jw4fPhzl5eVd9peXl0dzc3O3xzQ3N+e1nt5xIq7VBx98ELfccktcffXV/gGw49CX1+qxxx6Lz3zmM1FSUhJ33nln1NfXx8iRI3v3BAaRvrpWP/rRj6KwsDC+9a1v9f7QA4AYAbr14YcfxpVXXhlZlsXdd9+dehx6cMkll0RTU1Ns2bIlLrvssrjyyitj//79qcfiv2zfvj3uuuuuWLduXRQUFKQe56QkRuhi5MiRMXTo0Ghpaemyv6WlJSoqKro9pqKiIq/19I6+vFYfh8iuXbuivr7eXZHj1JfX6rTTTouzzz47Lrroorj33nujsLAw7r333t49gUGkL67VH//4x9i/f3+MGzcuCgsLo7CwMHbt2hU33XRTjB8/vk/Oo78RI3RRVFQUU6dOjYaGhs59HR0d0dDQEDU1Nd0eU1NT02V9RER9fX2P6+kdfXWtPg6Rv/71r/HUU0/FmWee2TcnMIicyF9XHR0d0dbWdvxDD1J9ca2uueaa+POf/xxNTU2dW2VlZdx8883x5JNP9t3J9Cepn6Dl5LN+/fqsuLg4W7duXfbKK69k3/jGN7IRI0Zkzc3NWZZl2TXXXJPdeuutneuff/75rLCwMPvpT3+a/eUvf8mWL1/+iY+1/fOf/8x27NiRbdq0KYuIbP369dmOHTuyffv2nfDzG0h6+1q1t7dnV1xxRTZ27Nisqakp27dvX+fW1taW5BwHit6+VgcPHsyWLVuWNTY2Zv/4xz+ybdu2ZQsXLsyKi4uznTt3JjnHgaIvfg/8Xz5N05UYoVs/+9nPsnHjxmVFRUXZtGnTshdeeKHztRkzZmQLFizosv6BBx7IPv/5z2dFRUXZeeedl23atKnL67/61a+yiPjEtnz58hNwNgNbb16rjz963d32hz/84QSd0cDVm9fq/fffz77+9a9nlZWVWVFRUTZ69OjsiiuuyLZu3XqiTmdA6+3fA/+XGOmqIMuyLM09GQAAz4wAAImJEQAgKTECACQlRgCApMQIAJCUGAEAkhIjAEBSYgQASEqMAABJiREAICkxAgAkJUYAgKT+P2tJZu7wZ2M1AAAAAElFTkSuQmCC",
+      "text/plain": [
+       "<Figure size 640x480 with 1 Axes>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
     }
    ],
    "source": [
-    "inputs = spike_generator(100,0.01,100)\n",
+    "poisson = ballena.PoissonGenerator( [200,100,50], 0.05 )\n",
     "\n",
-    "t_ballena = simulate_ballena_fast(inputs, w=4, tau=4, max_time=100, epochs=5000)\n",
-    "t_nest    = simulate_nest_fast(inputs, w=4, tau=4, max_time=100, epochs=5000)\n",
     "\n",
-    "print('t_ballena', t_ballena)\n",
-    "print('t_nest', t_nest)\n",
-    "print(f'ballena es {t_nest/t_ballena} veces mas rapido')"
+    "spikes = poisson.get_spikes()\n",
+    "print( [len(spk) for spk in spikes] )\n",
+    "\n",
+    "for idx,ch in enumerate(spikes):\n",
+    "    plt.vlines(ch, idx-0.2, idx+0.2)\n",
+    "    \n",
+    "plt.plot()"
    ]
   }
  ],

sim_ballena-0.1.0/src/instances.rs

@@ -1,36 +0,0 @@
-use pyo3::prelude::*;
-use crate::utils::vec_of_tuples;
-
-#[pyclass]
-pub struct Instance{
-    spikes: Vec<(f64,usize)>
-}
-
-#[pymethods]
-impl Instance{
-    #[new]
-    fn new(obj: &Bound<'_,PyAny>)->PyResult<Self>{
-        let mut spikes = match vec_of_tuples::<f64>(obj){
-            Ok(v)  => v,
-            Err(e) => return Err(e)
-        };
-
-
-        spikes.sort_by(|a,b|a.0.partial_cmp(&b.0).unwrap());
-
-        Ok(Self{spikes})
-    }
-
-    fn __str__(&self)->String{
-        format!("Input(count={})",self.spikes.len())
-    }
-
-    fn __repr__(&self)->String{
-        self.__str__()
-    }
-
-    pub fn get(&self)->&Vec<(f64,usize)>{
-        &self.spikes
-    }
-}
-

sim_ballena-0.1.0/test_file.py

@@ -1,81 +0,0 @@
-import sim_ballena as ballena
-import matplotlib.pyplot as plt
-import random
-import time
-
-inputs = ballena.Instance( [(40*t/100,0) for t in range(1,100)] )
-n = [ballena.Lif().tau(10).t_refractory(0.001)]
-syn_in  = [(0,0)]
-syn_net = []
-w_in    = [4] 
-w_net   = []
-outputs = [0]
-
-# ========================
-#  RED QUE GRABA VOLTAJES
-# ========================
-net = (ballena.Network(n)
-       .synapses_in(syn_in)
-       .synapses_net(syn_net)
-       .weights_in(w_in)
-       .weights_net(w_net)
-       .outputs(outputs)
-       .mode(['VOLTAGES','SPIKES']))
-
-start = time.time()
-for _ in range(5000):
-       res = net.simulate( inputs, 40  )
-print(f"{time.time()-start}")
-
-# ========================
-#  RED QUE NO GRABA 
-# ========================
-net = (ballena.Network(n)
-       .synapses_in(syn_in)
-       .synapses_net(syn_net)
-       .weights_in(w_in)
-       .weights_net(w_net)
-       .outputs(outputs)
-       .mode(['SPIKES']))
-
-start = time.time()
-for _ in range(5000):
-       res = net.simulate( inputs, 40  )
-print(f"{time.time()-start}")
-
-
-
-
-
-# inputs_ = [(t/4,0) for t in range(1,40)]
-# inputs = ballena.Instance(inputs_)
-
-# n = [ballena.Lif().tau(10).t_refractory(2),
-#      ballena.Lif().tau(20)]
-# syn_in  = [(0,0)]
-# syn_net = [(0,1)]
-# w_in    = [4] 
-# w_net   = [9]
-# outputs = [0,1]
-
-# net = (ballena.Network(n)
-#        .synapses_in(syn_in)
-#        .synapses_net(syn_net)
-#        .weights_in(w_in)
-#        .weights_net(w_net)
-#        .outputs(outputs)
-#        .mode(['VOLTAGES','SPIKES']))
-
-# res = net.simulate( inputs, 11  )
-
-# time = res.time()
-# volt = res.voltages()
-
-# print( res.spikes() )
-
-# plt.plot( time,volt[0], label=f'neu {outputs[0]}' )
-# plt.plot( time,volt[1], label=f'neu {outputs[1]}' )
-# plt.vlines(res.spikes()[0], -70, -55, linestyles='dashed', colors='red')
-# plt.legend()
-# plt.grid()
-# plt.show()