fixing a bug

Author: rvalavi

src/core.rs

@@ -9,13 +9,15 @@ use crate::affines::Affine;
 use crate::utils;
 use crate::distance;
 
+
 pub fn similarityrs(
     x: &Array2<f32>, 
     trans: &Affine,
     is_geo: bool, 
     bandwidth: f64,
     radius: Option<f32>,
     nsample: usize, 
+    ncols: usize,
     seed: u64
 ) -> Result<Vec<f64>> {
     let (rows, cols) = x.dim();
@@ -27,7 +29,7 @@ pub fn similarityrs(
     let data = x.as_slice().context("Array not contiguous")?;
 
     // Get the XY for distance calc
-    let xy: Vec<(f64, f64)> = utils::get_xy(data.len(), cols, trans)?;
+    let xy: Vec<(f64, f64)> = utils::get_xy(data.len(), ncols, trans)?;
 
     // Pre-calc valid cells to skip processing nan cells
     let valid_rows: Vec<usize> = (0..rows)

src/distance.rs

@@ -30,5 +30,5 @@ pub fn distance_km(x1: f64, y1: f64, x2: f64, y2: f64, geo: bool) -> f32 {
         euclidean(x1, y1, x2, y2)
     };
 
-    (dist / 1000.0)  as f32
+    (dist / 1000.0) as f32
 }

src/lib.rs

@@ -34,7 +34,7 @@ fn similaritypy(
         .map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
 
     let out: Vec<f64> = pool
-        .install(|| core::similarityrs(&array, &affine, is_geo, bandwidth, radius, nsample, seed))
+        .install(|| core::similarityrs(&array, &affine, is_geo, bandwidth, radius, nsample, ncols, seed))
         .map_err(|er| PyRuntimeError::new_err(format!("Climsim failed: {er}")))?;
 
     let outarray: Array2<f64> = Array2::from_shape_vec((nrows, ncols), out)