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

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

@@ -4,9 +4,11 @@ version = 4
 
 [[package]]
 name = "SimBallenaSNN"
-version = "0.1.0"
+version = "0.1.1"
 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.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "SimBallenaSNN"
-version = "0.1.0"
+version = "0.1.1"
 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.1}/PKG-INFO

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

sim_ballena-0.1.1/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.1}/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.1}/tests.ipynb

@@ -2,9 +2,31 @@
  "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",
@@ -16,7 +38,7 @@
   },
   {
    "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,49 @@
   },
   {
    "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"
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "t_ballena 0.8343455791473389\n",
+      "t_nest 7.572166204452515\n",
+      "ballena es 9.075575389505754 veces mas rapido\n"
+     ]
     }
    ],
    "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,
+   "execution_count": 26,
    "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"
-     ]
+     "data": {
+      "text/plain": [
+       "<PoissonGenerator at 0x76a489929f70>"
+      ]
+     },
+     "execution_count": 26,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
-    "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')"
+    "poisson = ballena.PoissonGenerator( [100,1000,500], 0.05 )\n",
+    "poisson"
    ]
   }
  ],

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
-    }
-}
-