fixed test

test/unit_tests/line_end_pull_up/test.act

@@ -1,48 +0,0 @@
-/*************************************************************************
- *
- *  This file is part of ACT dataflow neuro library.
- * It's the testing facility for cell_lib_std.act
- *
- *  Copyright (c) 2022 University of Groningen - Ole Richter  
- *  Copyright (c) 2022 University of Groningen - Hugh Greatorex
- *  Copyright (c) 2022 University of Groningen - Michele Mastella
- *  Copyright (c) 2022 University of Groningen - Madison Cotteret
- *
- *  This source describes Open Hardware and is licensed under the CERN-OHL-W v2 or later
- *
- *  You may redistribute and modify this documentation and make products
- *  using it under the terms of the CERN-OHL-W v2 (https:/cern.ch/cern-ohl).
- *  This documentation is distributed WITHOUT ANY EXPRESS OR IMPLIED
- *  WARRANTY, INCLUDING OF MERCHANTABILITY, SATISFACTORY QUALITY
- *  AND FITNESS FOR A PARTICULAR PURPOSE. Please see the CERN-OHL-W v2
- *  for applicable conditions.
- *
- *  Source location: https://git.web.rug.nl/bics/actlib_dataflow_neuro
- *
- *  As per CERN-OHL-W v2 section 4.1, should You produce hardware based on
- *  these sources, You must maintain the Source Location visible in its
- *  documentation.
- *
- **************************************************************************
- */
-
-import "../../dataflow_neuro/primitives.act";
-import globals;
-
-open tmpl::dataflow_neuro;
-
-defproc lepu (a1of1 in;  bool! out){
-
-    line_end_pull_up lepu(.in=in, .out=out);
-    //Low active Reset 
-    bool _reset_B; 
-    prs {
-    	Reset => _reset_B-
-    }
-    lepu.supply.vss = GND;
-    lepu.supply.vdd = Vdd;
-    lepu.reset_B = _reset_B;
-    
-}
-
-lepu t;

test/unit_tests/line_end_pull_up/test.prsim

@@ -1,15 +0,0 @@
-watchall 
-
-set t.in.a 0
-cycle
-
-system "echo 'yo man'"
-
-set Reset 0
-cycle 
-
-
-set t.in.a 1
-cycle
-
-assert t.out 1

test/unit_tests/nrn_hs_2D_array_3x5/test.act

@@ -31,16 +31,43 @@ import globals;
 
 open tmpl::dataflow_neuro;
 
-defproc nrn_hs_2D_array_3x5(a1of1 in[15]; a1of1 outx[3], outy[5])
+pint Nx = 3;
+pint Ny = 5;
+defproc nrn_hs_2d_array_3x5(a1of1 in[15]; a1of1 outx[3], outy[5])
 {
-  bool _reset_B; 
+	power supply;
-  prs {
+    supply.vdd = Vdd;
-    Reset => _reset_B-
+    supply.vss = GND;
-  }
+
-  nrn_hs_2D_array<3,5,5> b(.in = in, .outx = outx, .outy = outy);
+	bool _reset_B; 
-  b.supply.vdd = Vdd;
+	prs {
-  b.supply.vss = GND; 
+		Reset => _reset_B-
-  b.reset_B = _reset_B;
+	}	
+	nrn_hs_2d_array<3,5> b(.in = in, .outx = outx, .outy = outy);
+	
+	b.supply = supply; 
+	b.reset_B = _reset_B;
+
+
+
+	nrn_line_end_pull_down pd_x[Nx], pd_y[Ny];
+	(i:Nx:
+		pd_x[i].in = b.to_pd_x[i].a;
+		pd_x[i].out = b.to_pd_x[i].r;
+
+		pd_x[i].supply = supply;
+		pd_x[i].reset_B = _reset_B;
+	)
+
+	(i:Ny:
+		pd_y[i].in = b.to_pd_y[i].a;
+		pd_y[i].out = b.to_pd_y[i].r;
+		
+		pd_y[i].supply = supply;
+		pd_y[i].reset_B = _reset_B;
+	)
+
+
 }
 
-nrn_hs_2D_array_3x5 b;
+nrn_hs_2d_array_3x5 b;

test/unit_tests/nrn_hs_2D_array_3x5/test.prsim

@@ -26,18 +26,18 @@ set b.outy[2].a 0
 set b.outy[3].a 0
 set b.outy[4].a 0
 
-set b.outx[0].r 1
+# set b.outx[0].r 1
-set b.outx[1].r 1
+# set b.outx[1].r 1
-set b.outx[2].r 1
+# set b.outx[2].r 1
 
-set b.outy[0].r 1
+# set b.outy[0].r 1
-set b.outy[1].r 1
+# set b.outy[1].r 1
-set b.outy[2].r 1
+# set b.outy[2].r 1
-set b.outy[3].r 1
+# set b.outy[3].r 1
-set b.outy[4].r 0
+# set b.outy[4].r 0
 
-set b.b.neurons[0]._en 0
+# set b.b.neurons[0]._en 0
-set b.b.neurons[0]._req 1
+# set b.b.neurons[0]._req 1
 
 # set Reset 0
 cycle