From 3331f7db21e10a85072dfd7d38004cd007a2c601 Mon Sep 17 00:00:00 2001 From: Jamin Hanna Date: Mon, 22 Jun 2026 10:20:48 -0400 Subject: [PATCH] added izhikevich processor --- include/izhikevich.hpp | 178 ++++ makefile | 13 + scripts/test_izhikevich.sh | 97 ++ scripts/test_risp.sh | 28 +- scripts/test_vrisp.sh | 28 +- src/izhikevich.cpp | 936 ++++++++++++++++++ src/izhikevich_static.cpp | 18 + testing/izhikevich/01/correct_output.txt | 4 + testing/izhikevich/01/label.txt | 1 + testing/izhikevich/01/network_tool.txt | 5 + testing/izhikevich/01/processor.sh | 2 + testing/izhikevich/01/processor_tool.txt | 6 + testing/izhikevich/02/correct_output.txt | 3 + testing/izhikevich/02/label.txt | 1 + testing/izhikevich/02/network_tool.txt | 6 + testing/izhikevich/02/processor.sh | 3 + testing/izhikevich/02/processor_tool.txt | 9 + testing/izhikevich/03/correct_output.txt | 2 + testing/izhikevich/03/label.txt | 1 + testing/izhikevich/03/network_tool.txt | 7 + testing/izhikevich/03/processor.sh | 3 + testing/izhikevich/03/processor_tool.txt | 10 + testing/izhikevich/04/correct_output.txt | 4 + testing/izhikevich/04/label.txt | 1 + testing/izhikevich/04/network_tool.txt | 6 + testing/izhikevich/04/processor.sh | 3 + testing/izhikevich/04/processor_tool.txt | 12 + testing/izhikevich/05/correct_output.txt | 3 + testing/izhikevich/05/label.txt | 1 + testing/izhikevich/05/network_tool.txt | 7 + testing/izhikevich/05/processor.sh | 3 + testing/izhikevich/05/processor_tool.txt | 9 + testing/izhikevich/06/correct_output.txt | 2 + testing/izhikevich/06/label.txt | 1 + testing/izhikevich/06/network_tool.txt | 8 + testing/izhikevich/06/processor.sh | 3 + testing/izhikevich/06/processor_tool.txt | 10 + testing/izhikevich/07/correct_output.txt | 2 + testing/izhikevich/07/label.txt | 1 + testing/izhikevich/07/network_tool.txt | 11 + testing/izhikevich/07/processor.sh | 4 + testing/izhikevich/07/processor_tool.txt | 3 + testing/izhikevich/08/correct_output.txt | 3 + testing/izhikevich/08/label.txt | 1 + testing/izhikevich/08/network_tool.txt | 3 + testing/izhikevich/08/processor.sh | 2 + testing/izhikevich/08/processor_tool.txt | 5 + testing/izhikevich/09/correct_output.txt | 3 + testing/izhikevich/09/label.txt | 1 + testing/izhikevich/09/network_tool.txt | 11 + testing/izhikevich/09/processor.sh | 3 + testing/izhikevich/09/processor_tool.txt | 9 + testing/izhikevich/10/correct_output.txt | 3 + testing/izhikevich/10/label.txt | 1 + testing/izhikevich/10/network_tool.txt | 11 + testing/izhikevich/10/processor.sh | 3 + testing/izhikevich/10/processor_tool.txt | 11 + testing/izhikevich/11/correct_output.txt | 20 + testing/izhikevich/11/label.txt | 1 + testing/izhikevich/11/network_tool.txt | 3 + testing/izhikevich/11/processor.sh | 13 + testing/izhikevich/11/processor_tool.txt | 5 + testing/{ => risp}/01/correct_output.txt | 0 testing/{ => risp}/01/label.txt | 0 testing/{ => risp}/01/network_tool.txt | 0 testing/{ => risp}/01/processor.sh | 0 testing/{ => risp}/01/processor_tool.txt | 0 testing/{ => risp}/02/correct_output.txt | 0 testing/{ => risp}/02/label.txt | 0 testing/{ => risp}/02/network_tool.txt | 0 testing/{ => risp}/02/processor.sh | 0 testing/{ => risp}/02/processor_tool.txt | 0 testing/{ => risp}/03/correct_output.txt | 0 testing/{ => risp}/03/label.txt | 0 testing/{ => risp}/03/network_tool.txt | 0 testing/{ => risp}/03/processor.sh | 0 testing/{ => risp}/03/processor_tool.txt | 0 testing/{ => risp}/04/correct_output.txt | 0 testing/{ => risp}/04/label.txt | 0 testing/{ => risp}/04/network_tool.txt | 0 testing/{ => risp}/04/processor.sh | 0 testing/{ => risp}/04/processor_tool.txt | 0 testing/{ => risp}/05/correct_output.txt | 0 testing/{ => risp}/05/label.txt | 0 testing/{ => risp}/05/network_tool.txt | 0 testing/{ => risp}/05/processor.sh | 0 testing/{ => risp}/05/processor_tool.txt | 0 testing/{ => risp}/06/correct_output.txt | 0 testing/{ => risp}/06/label.txt | 0 testing/{ => risp}/06/network_tool.txt | 0 testing/{ => risp}/06/processor.sh | 0 testing/{ => risp}/06/processor_tool.txt | 0 testing/{ => risp}/07/correct_output.txt | 0 testing/{ => risp}/07/label.txt | 0 testing/{ => risp}/07/network_tool.txt | 0 testing/{ => risp}/07/processor.sh | 0 testing/{ => risp}/07/processor_tool.txt | 0 testing/{ => risp}/08/correct_output.txt | 0 testing/{ => risp}/08/label.txt | 0 testing/{ => risp}/08/network_tool.txt | 0 testing/{ => risp}/08/processor.sh | 0 testing/{ => risp}/08/processor_tool.txt | 0 testing/{ => risp}/09/correct_output.txt | 0 testing/{ => risp}/09/label.txt | 0 testing/{ => risp}/09/network_tool.txt | 0 testing/{ => risp}/09/processor.sh | 0 testing/{ => risp}/09/processor_tool.txt | 0 testing/{ => risp}/10/correct_output.txt | 0 testing/{ => risp}/10/label.txt | 0 testing/{ => risp}/10/network_tool.txt | 0 testing/{ => risp}/10/processor.sh | 0 testing/{ => risp}/10/processor_tool.txt | 0 testing/{ => risp}/11/correct_output.txt | 0 testing/{ => risp}/11/label.txt | 0 testing/{ => risp}/11/network_tool.txt | 0 testing/{ => risp}/11/processor.sh | 0 testing/{ => risp}/11/processor_tool.txt | 0 testing/{ => risp}/12/correct_output.txt | 0 testing/{ => risp}/12/label.txt | 0 testing/{ => risp}/12/network_tool.txt | 0 testing/{ => risp}/12/processor.sh | 0 testing/{ => risp}/12/processor_tool.txt | 0 testing/{ => risp}/13/correct_output.txt | 0 testing/{ => risp}/13/label.txt | 0 testing/{ => risp}/13/network_tool.txt | 0 testing/{ => risp}/13/processor.sh | 0 testing/{ => risp}/13/processor_tool.txt | 0 testing/{ => risp}/14/correct_output.txt | 0 testing/{ => risp}/14/label.txt | 0 testing/{ => risp}/14/network_tool.txt | 0 testing/{ => risp}/14/processor.sh | 0 testing/{ => risp}/14/processor_tool.txt | 0 testing/{ => risp}/15/correct_output.txt | 0 testing/{ => risp}/15/label.txt | 0 testing/{ => risp}/15/network_tool.txt | 0 testing/{ => risp}/15/processor.sh | 0 testing/{ => risp}/15/processor_tool.txt | 0 testing/{ => risp}/16/correct_output.txt | 0 testing/{ => risp}/16/label.txt | 0 testing/{ => risp}/16/network_tool.txt | 0 testing/{ => risp}/16/processor.sh | 0 testing/{ => risp}/16/processor_tool.txt | 0 testing/{ => risp}/17/correct_output.txt | 0 testing/{ => risp}/17/label.txt | 0 testing/{ => risp}/17/network_tool.txt | 0 testing/{ => risp}/17/processor.sh | 0 testing/{ => risp}/17/processor_tool.txt | 0 testing/{ => risp}/18/correct_output.txt | 0 testing/{ => risp}/18/label.txt | 0 testing/{ => risp}/18/network_tool.txt | 0 testing/{ => risp}/18/processor.sh | 0 testing/{ => risp}/18/processor_tool.txt | 0 testing/{ => risp}/19/correct_output.txt | 0 testing/{ => risp}/19/label.txt | 0 testing/{ => risp}/19/network_tool.txt | 0 testing/{ => risp}/19/processor.sh | 0 testing/{ => risp}/19/processor_tool.txt | 0 testing/{ => risp}/20/correct_output.txt | 0 testing/{ => risp}/20/label.txt | 0 testing/{ => risp}/20/network_tool.txt | 0 testing/{ => risp}/20/processor.sh | 0 testing/{ => risp}/20/processor_tool.txt | 0 testing/{ => risp}/21/correct_output.txt | 0 testing/{ => risp}/21/label.txt | 0 testing/{ => risp}/21/network_tool.txt | 0 testing/{ => risp}/21/processor.sh | 0 testing/{ => risp}/21/processor_tool.txt | 0 testing/{ => risp}/22/correct_output.txt | 0 testing/{ => risp}/22/label.txt | 0 testing/{ => risp}/22/network_tool.txt | 0 testing/{ => risp}/22/processor.sh | 0 testing/{ => risp}/22/processor_tool.txt | 0 testing/{ => risp}/23/correct_output.txt | 0 testing/{ => risp}/23/label.txt | 0 testing/{ => risp}/23/network_tool.txt | 0 testing/{ => risp}/23/processor.sh | 0 testing/{ => risp}/23/processor_tool.txt | 0 testing/{ => risp}/24/correct_output.txt | 0 testing/{ => risp}/24/label.txt | 0 testing/{ => risp}/24/network_tool.txt | 0 testing/{ => risp}/24/processor.sh | 0 testing/{ => risp}/24/processor_tool.txt | 0 testing/{ => risp}/25/correct_output.txt | 0 testing/{ => risp}/25/label.txt | 0 testing/{ => risp}/25/network_tool.txt | 0 testing/{ => risp}/25/processor.sh | 0 testing/{ => risp}/25/processor_tool.txt | 0 testing/{ => risp}/26/correct_output.txt | 0 testing/{ => risp}/26/label.txt | 0 testing/{ => risp}/26/network_tool.txt | 0 testing/{ => risp}/26/processor.sh | 0 testing/{ => risp}/26/processor_tool.txt | 0 testing/{ => risp}/27/correct_output.txt | 0 testing/{ => risp}/27/label.txt | 0 testing/{ => risp}/27/network_tool.txt | 0 testing/{ => risp}/27/processor.sh | 0 testing/{ => risp}/27/processor_tool.txt | 0 testing/{ => risp}/28/correct_output.txt | 0 testing/{ => risp}/28/label.txt | 0 testing/{ => risp}/28/network_tool.txt | 0 testing/{ => risp}/28/processor.sh | 0 testing/{ => risp}/28/processor_tool.txt | 0 testing/{ => risp}/29/correct_output.txt | 0 testing/{ => risp}/29/label.txt | 0 testing/{ => risp}/29/network_tool.txt | 0 testing/{ => risp}/29/processor.sh | 0 testing/{ => risp}/29/processor_tool.txt | 0 testing/{ => risp}/30/correct_output.txt | 0 testing/{ => risp}/30/label.txt | 0 testing/{ => risp}/30/network_tool.txt | 0 testing/{ => risp}/30/processor.sh | 0 testing/{ => risp}/30/processor_tool.txt | 0 testing/{ => risp}/31/correct_output.txt | 0 testing/{ => risp}/31/label.txt | 0 testing/{ => risp}/31/network_tool.txt | 0 testing/{ => risp}/31/processor.sh | 0 testing/{ => risp}/31/processor_tool.txt | 0 testing/{ => risp}/32/correct_output.txt | 0 testing/{ => risp}/32/label.txt | 0 testing/{ => risp}/32/network_tool.txt | 0 testing/{ => risp}/32/processor.sh | 0 testing/{ => risp}/32/processor_tool.txt | 0 testing/{ => risp}/33/correct_output.txt | 0 testing/{ => risp}/33/label.txt | 0 testing/{ => risp}/33/network_tool.txt | 0 testing/{ => risp}/33/processor.sh | 0 testing/{ => risp}/33/processor_tool.txt | 0 testing/{ => risp}/34/correct_output.txt | 0 testing/{ => risp}/34/label.txt | 0 testing/{ => risp}/34/network_tool.txt | 0 testing/{ => risp}/34/processor.sh | 0 testing/{ => risp}/34/processor_tool.txt | 0 testing/{ => risp}/35/correct_output.txt | 0 testing/{ => risp}/35/label.txt | 0 testing/{ => risp}/35/network_tool.txt | 0 testing/{ => risp}/35/processor.sh | 0 testing/{ => risp}/35/processor_tool.txt | 0 testing/{ => risp}/36/correct_output.txt | 0 testing/{ => risp}/36/label.txt | 0 testing/{ => risp}/36/network_tool.txt | 0 testing/{ => risp}/36/processor.sh | 0 testing/{ => risp}/36/processor_tool.txt | 0 testing/{ => risp}/37/correct_output.txt | 0 testing/{ => risp}/37/label.txt | 0 testing/{ => risp}/37/network_tool.txt | 0 testing/{ => risp}/37/processor.sh | 0 testing/{ => risp}/37/processor_tool.txt | 0 testing/{ => risp}/38/correct_output.txt | 0 testing/{ => risp}/38/label.txt | 0 testing/{ => risp}/38/network_tool.txt | 0 testing/{ => risp}/38/processor.sh | 0 testing/{ => risp}/38/processor_tool.txt | 0 testing/{ => risp}/39/correct_output.txt | 0 testing/{ => risp}/39/label.txt | 0 testing/{ => risp}/39/network_tool.txt | 0 testing/{ => risp}/39/processor.sh | 0 testing/{ => risp}/39/processor_tool.txt | 0 testing/{ => risp}/40/correct_output.txt | 0 testing/{ => risp}/40/label.txt | 0 testing/{ => risp}/40/network_tool.txt | 0 testing/{ => risp}/40/processor.sh | 0 testing/{ => risp}/40/processor_tool.txt | 0 testing/{ => risp}/41/correct_output.txt | 0 testing/{ => risp}/41/label.txt | 0 testing/{ => risp}/41/network_tool.txt | 0 testing/{ => risp}/41/processor.sh | 0 testing/{ => risp}/41/processor_tool.txt | 0 testing/{ => risp}/42/correct_output.txt | 0 testing/{ => risp}/42/label.txt | 0 testing/{ => risp}/42/network_tool.txt | 0 testing/{ => risp}/42/processor.sh | 0 testing/{ => risp}/42/processor_tool.txt | 0 testing/{ => risp}/43/correct_output.txt | 0 testing/{ => risp}/43/label.txt | 0 testing/{ => risp}/43/network_tool.txt | 0 testing/{ => risp}/43/processor.sh | 0 testing/{ => risp}/43/processor_tool.txt | 0 testing/{ => risp}/44/correct_output.txt | 0 testing/{ => risp}/44/label.txt | 0 testing/{ => risp}/44/network_tool.txt | 0 testing/{ => risp}/44/processor.sh | 0 testing/{ => risp}/44/processor_tool.txt | 0 testing/{ => risp}/45/correct_output.txt | 0 testing/{ => risp}/45/label.txt | 0 testing/{ => risp}/45/network_tool.txt | 0 testing/{ => risp}/45/processor.sh | 0 testing/{ => risp}/45/processor_tool.txt | 0 testing/{ => risp}/46/correct_output.txt | 0 testing/{ => risp}/46/label.txt | 0 testing/{ => risp}/46/network_tool.txt | 0 testing/{ => risp}/46/processor.sh | 0 testing/{ => risp}/46/processor_tool.txt | 0 testing/{ => risp}/47/correct_output.txt | 0 testing/{ => risp}/47/label.txt | 0 testing/{ => risp}/47/network_tool.txt | 0 testing/{ => risp}/47/processor.sh | 0 testing/{ => risp}/47/processor_tool.txt | 0 testing/{ => risp}/48/correct_output.txt | 0 testing/{ => risp}/48/label.txt | 0 testing/{ => risp}/48/network_tool.txt | 0 testing/{ => risp}/48/processor.sh | 0 testing/{ => risp}/48/processor_tool.txt | 0 testing/{ => risp}/49/correct_output.txt | 0 testing/{ => risp}/49/label.txt | 0 testing/{ => risp}/49/network_tool.txt | 0 testing/{ => risp}/49/processor.sh | 0 testing/{ => risp}/49/processor_tool.txt | 0 testing/{ => risp}/50/correct_output.txt | 0 testing/{ => risp}/50/label.txt | 0 testing/{ => risp}/50/network_tool.txt | 0 testing/{ => risp}/50/processor.sh | 0 testing/{ => risp}/50/processor_tool.txt | 0 testing/{ => risp}/51/correct_output.txt | 0 testing/{ => risp}/51/label.txt | 0 testing/{ => risp}/51/network_tool.txt | 0 testing/{ => risp}/51/processor.sh | 0 testing/{ => risp}/51/processor_tool.txt | 0 testing/{ => risp}/52/correct_output.txt | 0 testing/{ => risp}/52/label.txt | 0 testing/{ => risp}/52/network_tool.txt | 0 testing/{ => risp}/52/processor.sh | 0 testing/{ => risp}/52/processor_tool.txt | 0 .../vrisp}/01/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/01/label.txt | 0 .../vrisp}/01/network_tool.txt | 0 .../vrisp}/01/processor.sh | 0 .../vrisp}/01/processor_tool.txt | 0 .../vrisp}/02/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/02/label.txt | 0 .../vrisp}/02/network_tool.txt | 0 .../vrisp}/02/processor.sh | 0 .../vrisp}/02/processor_tool.txt | 0 .../vrisp}/03/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/03/label.txt | 0 .../vrisp}/03/network_tool.txt | 0 .../vrisp}/03/processor.sh | 0 .../vrisp}/03/processor_tool.txt | 0 .../vrisp}/04/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/04/label.txt | 0 .../vrisp}/04/network_tool.txt | 0 .../vrisp}/04/processor.sh | 0 .../vrisp}/04/processor_tool.txt | 0 .../vrisp}/05/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/05/label.txt | 0 .../vrisp}/05/network_tool.txt | 0 .../vrisp}/05/processor.sh | 0 .../vrisp}/05/processor_tool.txt | 0 .../vrisp}/06/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/06/label.txt | 0 .../vrisp}/06/network_tool.txt | 0 .../vrisp}/06/processor.sh | 0 .../vrisp}/06/processor_tool.txt | 0 .../vrisp}/07/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/07/label.txt | 0 .../vrisp}/07/network_tool.txt | 0 .../vrisp}/07/processor.sh | 0 .../vrisp}/07/processor_tool.txt | 0 .../vrisp}/08/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/08/label.txt | 0 .../vrisp}/08/network_tool.txt | 0 .../vrisp}/08/processor.sh | 0 .../vrisp}/08/processor_tool.txt | 0 .../vrisp}/09/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/09/label.txt | 0 .../vrisp}/09/network_tool.txt | 0 .../vrisp}/09/processor.sh | 0 .../vrisp}/09/processor_tool.txt | 0 .../vrisp}/10/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/10/label.txt | 0 .../vrisp}/10/network_tool.txt | 0 .../vrisp}/10/processor.sh | 0 .../vrisp}/10/processor_tool.txt | 0 .../vrisp}/11/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/11/label.txt | 0 .../vrisp}/11/network_tool.txt | 0 .../vrisp}/11/processor.sh | 0 .../vrisp}/11/processor_tool.txt | 0 .../vrisp}/12/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/12/label.txt | 0 .../vrisp}/12/network_tool.txt | 0 .../vrisp}/12/processor.sh | 0 .../vrisp}/12/processor_tool.txt | 0 .../vrisp}/13/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/13/label.txt | 0 .../vrisp}/13/network_tool.txt | 0 .../vrisp}/13/processor.sh | 0 .../vrisp}/13/processor_tool.txt | 0 .../vrisp}/14/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/14/label.txt | 0 .../vrisp}/14/network_tool.txt | 0 .../vrisp}/14/processor.sh | 0 .../vrisp}/14/processor_tool.txt | 0 .../vrisp}/15/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/15/label.txt | 0 .../vrisp}/15/network_tool.txt | 0 .../vrisp}/15/processor.sh | 0 .../vrisp}/15/processor_tool.txt | 0 .../vrisp}/16/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/16/label.txt | 0 .../vrisp}/16/network_tool.txt | 0 .../vrisp}/16/processor.sh | 0 .../vrisp}/16/processor_tool.txt | 0 .../vrisp}/17/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/17/label.txt | 0 .../vrisp}/17/network_tool.txt | 0 .../vrisp}/17/processor.sh | 0 .../vrisp}/17/processor_tool.txt | 0 .../vrisp}/18/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/18/label.txt | 0 .../vrisp}/18/network_tool.txt | 0 .../vrisp}/18/processor.sh | 0 .../vrisp}/18/processor_tool.txt | 0 .../vrisp}/19/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/19/label.txt | 0 .../vrisp}/19/network_tool.txt | 0 .../vrisp}/19/processor.sh | 0 .../vrisp}/19/processor_tool.txt | 0 .../vrisp}/20/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/20/label.txt | 0 .../vrisp}/20/network_tool.txt | 0 .../vrisp}/20/processor.sh | 0 .../vrisp}/20/processor_tool.txt | 0 .../vrisp}/21/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/21/label.txt | 0 .../vrisp}/21/network_tool.txt | 0 .../vrisp}/21/processor.sh | 0 .../vrisp}/21/processor_tool.txt | 0 .../vrisp}/22/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/22/label.txt | 0 .../vrisp}/22/network_tool.txt | 0 .../vrisp}/22/processor.sh | 0 .../vrisp}/22/processor_tool.txt | 0 .../vrisp}/23/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/23/label.txt | 0 .../vrisp}/23/network_tool.txt | 0 .../vrisp}/23/processor.sh | 0 .../vrisp}/23/processor_tool.txt | 0 .../vrisp}/24/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/24/label.txt | 0 .../vrisp}/24/network_tool.txt | 0 .../vrisp}/24/processor.sh | 0 .../vrisp}/24/processor_tool.txt | 0 .../vrisp}/25/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/25/label.txt | 0 .../vrisp}/25/network_tool.txt | 0 .../vrisp}/25/processor.sh | 0 .../vrisp}/25/processor_tool.txt | 0 .../vrisp}/26/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/26/label.txt | 0 .../vrisp}/26/network_tool.txt | 0 .../vrisp}/26/processor.sh | 0 .../vrisp}/26/processor_tool.txt | 0 .../vrisp}/28/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/28/label.txt | 0 .../vrisp}/28/network_tool.txt | 0 .../vrisp}/28/processor.sh | 0 .../vrisp}/28/processor_tool.txt | 0 .../vrisp}/33/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/33/label.txt | 0 .../vrisp}/33/network_tool.txt | 0 .../vrisp}/33/processor.sh | 0 .../vrisp}/33/processor_tool.txt | 0 .../vrisp}/34/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/34/label.txt | 0 .../vrisp}/34/network_tool.txt | 0 .../vrisp}/34/processor.sh | 0 .../vrisp}/34/processor_tool.txt | 0 .../vrisp}/35/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/35/label.txt | 0 .../vrisp}/35/network_tool.txt | 0 .../vrisp}/35/processor.sh | 0 .../vrisp}/35/processor_tool.txt | 0 .../vrisp}/36/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/36/label.txt | 0 .../vrisp}/36/network_tool.txt | 0 .../vrisp}/36/processor.sh | 0 .../vrisp}/36/processor_tool.txt | 0 .../vrisp}/37/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/37/label.txt | 0 .../vrisp}/37/network_tool.txt | 0 .../vrisp}/37/processor.sh | 0 .../vrisp}/37/processor_tool.txt | 0 .../vrisp}/38/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/38/label.txt | 0 .../vrisp}/38/network_tool.txt | 0 .../vrisp}/38/processor.sh | 0 .../vrisp}/38/processor_tool.txt | 0 .../vrisp}/39/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/39/label.txt | 0 .../vrisp}/39/network_tool.txt | 0 .../vrisp}/39/processor.sh | 0 .../vrisp}/39/processor_tool.txt | 0 .../vrisp}/40/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/40/label.txt | 0 .../vrisp}/40/network_tool.txt | 0 .../vrisp}/40/processor.sh | 0 .../vrisp}/40/processor_tool.txt | 0 .../vrisp}/41/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/41/label.txt | 0 .../vrisp}/41/network_tool.txt | 0 .../vrisp}/41/processor.sh | 0 .../vrisp}/41/processor_tool.txt | 0 .../vrisp}/42/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/42/label.txt | 0 .../vrisp}/42/network_tool.txt | 0 .../vrisp}/42/processor.sh | 0 .../vrisp}/42/processor_tool.txt | 0 .../vrisp}/43/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/43/label.txt | 0 .../vrisp}/43/network_tool.txt | 0 .../vrisp}/43/processor.sh | 0 .../vrisp}/43/processor_tool.txt | 0 .../vrisp}/44/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/44/label.txt | 0 .../vrisp}/44/network_tool.txt | 0 .../vrisp}/44/processor.sh | 0 .../vrisp}/44/processor_tool.txt | 0 .../vrisp}/45/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/45/label.txt | 0 .../vrisp}/45/network_tool.txt | 0 .../vrisp}/45/processor.sh | 0 .../vrisp}/45/processor_tool.txt | 0 .../vrisp}/46/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/46/label.txt | 0 .../vrisp}/46/network_tool.txt | 0 .../vrisp}/46/processor.sh | 0 .../vrisp}/46/processor_tool.txt | 0 .../vrisp}/47/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/47/label.txt | 0 .../vrisp}/47/network_tool.txt | 0 .../vrisp}/47/processor.sh | 0 .../vrisp}/47/processor_tool.txt | 0 .../vrisp}/48/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/48/label.txt | 0 .../vrisp}/48/network_tool.txt | 0 .../vrisp}/48/processor.sh | 0 .../vrisp}/48/processor_tool.txt | 0 .../vrisp}/49/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/49/label.txt | 0 .../vrisp}/49/network_tool.txt | 0 .../vrisp}/49/processor.sh | 0 .../vrisp}/49/processor_tool.txt | 0 .../vrisp}/50/correct_output.txt | 0 {vrisp_testing => testing/vrisp}/50/label.txt | 0 .../vrisp}/50/network_tool.txt | 0 .../vrisp}/50/processor.sh | 0 .../vrisp}/50/processor_tool.txt | 0 547 files changed, 1539 insertions(+), 28 deletions(-) create mode 100644 include/izhikevich.hpp create mode 100644 scripts/test_izhikevich.sh create mode 100644 src/izhikevich.cpp create mode 100644 src/izhikevich_static.cpp create mode 100644 testing/izhikevich/01/correct_output.txt create mode 100644 testing/izhikevich/01/label.txt create mode 100644 testing/izhikevich/01/network_tool.txt create mode 100644 testing/izhikevich/01/processor.sh create mode 100644 testing/izhikevich/01/processor_tool.txt create mode 100644 testing/izhikevich/02/correct_output.txt create mode 100644 testing/izhikevich/02/label.txt create mode 100644 testing/izhikevich/02/network_tool.txt create mode 100644 testing/izhikevich/02/processor.sh create mode 100644 testing/izhikevich/02/processor_tool.txt create mode 100644 testing/izhikevich/03/correct_output.txt create mode 100644 testing/izhikevich/03/label.txt create mode 100644 testing/izhikevich/03/network_tool.txt create mode 100644 testing/izhikevich/03/processor.sh create mode 100644 testing/izhikevich/03/processor_tool.txt create mode 100644 testing/izhikevich/04/correct_output.txt create mode 100644 testing/izhikevich/04/label.txt create mode 100644 testing/izhikevich/04/network_tool.txt create mode 100644 testing/izhikevich/04/processor.sh create mode 100644 testing/izhikevich/04/processor_tool.txt create mode 100644 testing/izhikevich/05/correct_output.txt create mode 100644 testing/izhikevich/05/label.txt create mode 100644 testing/izhikevich/05/network_tool.txt create mode 100644 testing/izhikevich/05/processor.sh create mode 100644 testing/izhikevich/05/processor_tool.txt create mode 100644 testing/izhikevich/06/correct_output.txt create mode 100644 testing/izhikevich/06/label.txt create mode 100644 testing/izhikevich/06/network_tool.txt create mode 100644 testing/izhikevich/06/processor.sh create mode 100644 testing/izhikevich/06/processor_tool.txt create mode 100644 testing/izhikevich/07/correct_output.txt create mode 100644 testing/izhikevich/07/label.txt create mode 100644 testing/izhikevich/07/network_tool.txt create mode 100644 testing/izhikevich/07/processor.sh create mode 100644 testing/izhikevich/07/processor_tool.txt create mode 100644 testing/izhikevich/08/correct_output.txt create mode 100644 testing/izhikevich/08/label.txt create mode 100644 testing/izhikevich/08/network_tool.txt create mode 100644 testing/izhikevich/08/processor.sh create mode 100644 testing/izhikevich/08/processor_tool.txt create mode 100644 testing/izhikevich/09/correct_output.txt create mode 100644 testing/izhikevich/09/label.txt create mode 100644 testing/izhikevich/09/network_tool.txt create mode 100644 testing/izhikevich/09/processor.sh create mode 100644 testing/izhikevich/09/processor_tool.txt create mode 100644 testing/izhikevich/10/correct_output.txt create mode 100644 testing/izhikevich/10/label.txt create mode 100644 testing/izhikevich/10/network_tool.txt create mode 100644 testing/izhikevich/10/processor.sh create mode 100644 testing/izhikevich/10/processor_tool.txt create mode 100644 testing/izhikevich/11/correct_output.txt create mode 100644 testing/izhikevich/11/label.txt create mode 100644 testing/izhikevich/11/network_tool.txt create mode 100644 testing/izhikevich/11/processor.sh create mode 100644 testing/izhikevich/11/processor_tool.txt rename testing/{ => risp}/01/correct_output.txt (100%) rename testing/{ => risp}/01/label.txt (100%) rename testing/{ => risp}/01/network_tool.txt (100%) rename testing/{ => risp}/01/processor.sh (100%) rename testing/{ => risp}/01/processor_tool.txt (100%) rename testing/{ => risp}/02/correct_output.txt (100%) rename testing/{ => risp}/02/label.txt (100%) rename testing/{ => risp}/02/network_tool.txt (100%) rename testing/{ => risp}/02/processor.sh (100%) rename testing/{ => risp}/02/processor_tool.txt (100%) rename testing/{ => risp}/03/correct_output.txt (100%) rename testing/{ => risp}/03/label.txt (100%) rename testing/{ => risp}/03/network_tool.txt (100%) rename testing/{ => risp}/03/processor.sh (100%) rename testing/{ => risp}/03/processor_tool.txt (100%) rename testing/{ => risp}/04/correct_output.txt (100%) rename testing/{ => risp}/04/label.txt (100%) rename testing/{ => risp}/04/network_tool.txt (100%) rename testing/{ => risp}/04/processor.sh (100%) rename testing/{ => risp}/04/processor_tool.txt (100%) rename testing/{ => risp}/05/correct_output.txt (100%) rename testing/{ => risp}/05/label.txt (100%) rename testing/{ => risp}/05/network_tool.txt (100%) rename testing/{ => risp}/05/processor.sh (100%) rename testing/{ => risp}/05/processor_tool.txt (100%) rename testing/{ => risp}/06/correct_output.txt (100%) rename testing/{ => risp}/06/label.txt (100%) rename testing/{ => risp}/06/network_tool.txt (100%) rename testing/{ => risp}/06/processor.sh (100%) rename testing/{ => risp}/06/processor_tool.txt (100%) rename testing/{ => risp}/07/correct_output.txt (100%) rename testing/{ => risp}/07/label.txt (100%) rename testing/{ => risp}/07/network_tool.txt (100%) rename testing/{ => risp}/07/processor.sh (100%) rename testing/{ => risp}/07/processor_tool.txt (100%) rename testing/{ => risp}/08/correct_output.txt (100%) rename testing/{ => risp}/08/label.txt (100%) rename testing/{ => risp}/08/network_tool.txt (100%) rename testing/{ => risp}/08/processor.sh (100%) rename testing/{ => risp}/08/processor_tool.txt (100%) rename testing/{ => risp}/09/correct_output.txt (100%) rename testing/{ => risp}/09/label.txt (100%) rename testing/{ => risp}/09/network_tool.txt (100%) rename testing/{ => risp}/09/processor.sh (100%) rename testing/{ => risp}/09/processor_tool.txt (100%) rename testing/{ => risp}/10/correct_output.txt (100%) rename testing/{ => risp}/10/label.txt (100%) rename testing/{ => risp}/10/network_tool.txt (100%) rename testing/{ => risp}/10/processor.sh (100%) rename testing/{ => risp}/10/processor_tool.txt (100%) rename testing/{ => risp}/11/correct_output.txt (100%) rename testing/{ => risp}/11/label.txt (100%) rename testing/{ => risp}/11/network_tool.txt (100%) rename testing/{ => risp}/11/processor.sh (100%) rename testing/{ => risp}/11/processor_tool.txt (100%) rename testing/{ => risp}/12/correct_output.txt (100%) rename testing/{ => risp}/12/label.txt (100%) rename testing/{ => risp}/12/network_tool.txt (100%) rename testing/{ => risp}/12/processor.sh (100%) rename testing/{ => risp}/12/processor_tool.txt (100%) rename testing/{ => risp}/13/correct_output.txt (100%) rename testing/{ => risp}/13/label.txt (100%) rename testing/{ => risp}/13/network_tool.txt (100%) rename testing/{ => risp}/13/processor.sh (100%) rename testing/{ => risp}/13/processor_tool.txt (100%) rename testing/{ => risp}/14/correct_output.txt (100%) rename testing/{ => risp}/14/label.txt (100%) rename testing/{ => risp}/14/network_tool.txt (100%) rename testing/{ => risp}/14/processor.sh (100%) rename testing/{ => risp}/14/processor_tool.txt (100%) rename testing/{ => risp}/15/correct_output.txt (100%) rename testing/{ => risp}/15/label.txt (100%) rename testing/{ => risp}/15/network_tool.txt (100%) rename testing/{ => risp}/15/processor.sh (100%) rename testing/{ => risp}/15/processor_tool.txt (100%) rename testing/{ => risp}/16/correct_output.txt (100%) rename testing/{ => risp}/16/label.txt (100%) rename testing/{ => risp}/16/network_tool.txt (100%) rename testing/{ => risp}/16/processor.sh (100%) rename testing/{ => risp}/16/processor_tool.txt (100%) rename testing/{ => risp}/17/correct_output.txt (100%) rename testing/{ => risp}/17/label.txt (100%) rename testing/{ => risp}/17/network_tool.txt (100%) rename testing/{ => risp}/17/processor.sh (100%) rename testing/{ => risp}/17/processor_tool.txt (100%) rename testing/{ => risp}/18/correct_output.txt (100%) rename testing/{ => risp}/18/label.txt (100%) rename testing/{ => risp}/18/network_tool.txt (100%) rename testing/{ => risp}/18/processor.sh (100%) rename testing/{ => risp}/18/processor_tool.txt (100%) rename testing/{ => risp}/19/correct_output.txt (100%) rename testing/{ => risp}/19/label.txt (100%) rename testing/{ => risp}/19/network_tool.txt (100%) rename testing/{ => risp}/19/processor.sh (100%) rename testing/{ => risp}/19/processor_tool.txt (100%) rename testing/{ => risp}/20/correct_output.txt (100%) rename testing/{ => risp}/20/label.txt (100%) rename testing/{ => risp}/20/network_tool.txt (100%) rename testing/{ => risp}/20/processor.sh (100%) rename testing/{ => risp}/20/processor_tool.txt (100%) rename testing/{ => risp}/21/correct_output.txt (100%) rename testing/{ => risp}/21/label.txt (100%) rename testing/{ => risp}/21/network_tool.txt (100%) rename testing/{ => risp}/21/processor.sh (100%) rename testing/{ => risp}/21/processor_tool.txt (100%) rename testing/{ => risp}/22/correct_output.txt (100%) rename testing/{ => risp}/22/label.txt (100%) rename testing/{ => risp}/22/network_tool.txt (100%) rename testing/{ => risp}/22/processor.sh (100%) rename testing/{ => risp}/22/processor_tool.txt (100%) rename testing/{ => risp}/23/correct_output.txt (100%) rename testing/{ => risp}/23/label.txt (100%) rename testing/{ => risp}/23/network_tool.txt (100%) rename testing/{ => risp}/23/processor.sh (100%) rename testing/{ => risp}/23/processor_tool.txt (100%) rename testing/{ => risp}/24/correct_output.txt (100%) rename testing/{ => risp}/24/label.txt (100%) rename testing/{ => risp}/24/network_tool.txt (100%) rename testing/{ => risp}/24/processor.sh (100%) rename testing/{ => risp}/24/processor_tool.txt (100%) rename testing/{ => risp}/25/correct_output.txt (100%) rename testing/{ => risp}/25/label.txt (100%) rename testing/{ => risp}/25/network_tool.txt (100%) rename testing/{ => risp}/25/processor.sh (100%) rename testing/{ => risp}/25/processor_tool.txt (100%) rename testing/{ => risp}/26/correct_output.txt (100%) rename testing/{ => risp}/26/label.txt (100%) rename testing/{ => risp}/26/network_tool.txt (100%) rename testing/{ => risp}/26/processor.sh (100%) rename testing/{ => risp}/26/processor_tool.txt (100%) rename testing/{ => risp}/27/correct_output.txt (100%) rename testing/{ => risp}/27/label.txt (100%) rename testing/{ => risp}/27/network_tool.txt (100%) rename testing/{ => risp}/27/processor.sh (100%) rename testing/{ => risp}/27/processor_tool.txt (100%) rename testing/{ => risp}/28/correct_output.txt (100%) rename testing/{ => risp}/28/label.txt (100%) rename testing/{ => risp}/28/network_tool.txt (100%) rename testing/{ => risp}/28/processor.sh (100%) rename testing/{ => risp}/28/processor_tool.txt (100%) rename testing/{ => risp}/29/correct_output.txt (100%) rename testing/{ => risp}/29/label.txt (100%) rename testing/{ => risp}/29/network_tool.txt (100%) rename testing/{ => risp}/29/processor.sh (100%) rename testing/{ => risp}/29/processor_tool.txt (100%) rename testing/{ => risp}/30/correct_output.txt (100%) rename testing/{ => risp}/30/label.txt (100%) rename testing/{ => risp}/30/network_tool.txt (100%) rename testing/{ => risp}/30/processor.sh (100%) rename testing/{ => risp}/30/processor_tool.txt (100%) rename testing/{ => risp}/31/correct_output.txt (100%) rename testing/{ => risp}/31/label.txt (100%) rename testing/{ => risp}/31/network_tool.txt (100%) rename testing/{ => risp}/31/processor.sh (100%) rename testing/{ => risp}/31/processor_tool.txt (100%) rename testing/{ => risp}/32/correct_output.txt (100%) rename testing/{ => risp}/32/label.txt (100%) rename testing/{ => risp}/32/network_tool.txt (100%) rename testing/{ => risp}/32/processor.sh (100%) rename testing/{ => risp}/32/processor_tool.txt (100%) rename testing/{ => risp}/33/correct_output.txt (100%) rename testing/{ => risp}/33/label.txt (100%) rename testing/{ => risp}/33/network_tool.txt (100%) rename testing/{ => risp}/33/processor.sh (100%) rename testing/{ => risp}/33/processor_tool.txt (100%) rename testing/{ => risp}/34/correct_output.txt (100%) rename testing/{ => risp}/34/label.txt (100%) rename testing/{ => risp}/34/network_tool.txt (100%) rename testing/{ => risp}/34/processor.sh (100%) rename testing/{ => risp}/34/processor_tool.txt (100%) rename testing/{ => risp}/35/correct_output.txt (100%) rename testing/{ => risp}/35/label.txt (100%) rename testing/{ => risp}/35/network_tool.txt (100%) rename testing/{ => risp}/35/processor.sh (100%) rename testing/{ => risp}/35/processor_tool.txt (100%) rename testing/{ => risp}/36/correct_output.txt (100%) rename testing/{ => risp}/36/label.txt (100%) rename testing/{ => risp}/36/network_tool.txt (100%) rename testing/{ => risp}/36/processor.sh (100%) rename testing/{ => risp}/36/processor_tool.txt (100%) rename testing/{ => risp}/37/correct_output.txt (100%) rename testing/{ => risp}/37/label.txt (100%) rename testing/{ => risp}/37/network_tool.txt (100%) rename testing/{ => risp}/37/processor.sh (100%) rename testing/{ => risp}/37/processor_tool.txt (100%) rename testing/{ => risp}/38/correct_output.txt (100%) rename testing/{ => risp}/38/label.txt (100%) rename testing/{ => risp}/38/network_tool.txt (100%) rename testing/{ => risp}/38/processor.sh (100%) rename testing/{ => risp}/38/processor_tool.txt (100%) rename testing/{ => risp}/39/correct_output.txt (100%) rename testing/{ => risp}/39/label.txt (100%) rename testing/{ => risp}/39/network_tool.txt (100%) rename testing/{ => risp}/39/processor.sh (100%) rename testing/{ => risp}/39/processor_tool.txt (100%) rename testing/{ => risp}/40/correct_output.txt (100%) rename testing/{ => risp}/40/label.txt (100%) rename testing/{ => risp}/40/network_tool.txt (100%) rename testing/{ => risp}/40/processor.sh (100%) rename testing/{ => risp}/40/processor_tool.txt (100%) rename testing/{ => risp}/41/correct_output.txt (100%) rename testing/{ => risp}/41/label.txt (100%) rename testing/{ => risp}/41/network_tool.txt (100%) rename testing/{ => risp}/41/processor.sh (100%) rename testing/{ => risp}/41/processor_tool.txt (100%) rename testing/{ => risp}/42/correct_output.txt (100%) rename testing/{ => risp}/42/label.txt (100%) rename testing/{ => risp}/42/network_tool.txt (100%) rename testing/{ => risp}/42/processor.sh (100%) rename testing/{ => risp}/42/processor_tool.txt (100%) rename testing/{ => risp}/43/correct_output.txt (100%) rename testing/{ => risp}/43/label.txt (100%) rename testing/{ => risp}/43/network_tool.txt (100%) rename testing/{ => risp}/43/processor.sh (100%) rename testing/{ => risp}/43/processor_tool.txt (100%) rename testing/{ => risp}/44/correct_output.txt (100%) rename testing/{ => risp}/44/label.txt (100%) rename testing/{ => risp}/44/network_tool.txt (100%) rename testing/{ => risp}/44/processor.sh (100%) rename testing/{ => risp}/44/processor_tool.txt (100%) rename testing/{ => risp}/45/correct_output.txt (100%) rename testing/{ => risp}/45/label.txt (100%) rename testing/{ => risp}/45/network_tool.txt (100%) rename testing/{ => risp}/45/processor.sh (100%) rename testing/{ => risp}/45/processor_tool.txt (100%) rename testing/{ => risp}/46/correct_output.txt (100%) rename testing/{ => risp}/46/label.txt (100%) rename testing/{ => risp}/46/network_tool.txt (100%) rename testing/{ => risp}/46/processor.sh (100%) rename testing/{ => risp}/46/processor_tool.txt (100%) rename testing/{ => risp}/47/correct_output.txt (100%) rename testing/{ => risp}/47/label.txt (100%) rename testing/{ => risp}/47/network_tool.txt (100%) rename testing/{ => risp}/47/processor.sh (100%) rename testing/{ => risp}/47/processor_tool.txt (100%) rename testing/{ => risp}/48/correct_output.txt (100%) rename testing/{ => risp}/48/label.txt (100%) rename testing/{ => risp}/48/network_tool.txt (100%) rename testing/{ => risp}/48/processor.sh (100%) rename testing/{ => risp}/48/processor_tool.txt (100%) rename testing/{ => risp}/49/correct_output.txt (100%) rename testing/{ => risp}/49/label.txt (100%) rename testing/{ => risp}/49/network_tool.txt (100%) rename testing/{ => risp}/49/processor.sh (100%) rename testing/{ => risp}/49/processor_tool.txt (100%) rename testing/{ => risp}/50/correct_output.txt (100%) rename testing/{ => risp}/50/label.txt (100%) rename testing/{ => risp}/50/network_tool.txt (100%) rename testing/{ => risp}/50/processor.sh (100%) rename testing/{ => risp}/50/processor_tool.txt (100%) rename testing/{ => risp}/51/correct_output.txt (100%) rename testing/{ => risp}/51/label.txt (100%) rename testing/{ => risp}/51/network_tool.txt (100%) rename testing/{ => risp}/51/processor.sh (100%) rename testing/{ => risp}/51/processor_tool.txt (100%) rename testing/{ => risp}/52/correct_output.txt (100%) rename testing/{ => risp}/52/label.txt (100%) rename testing/{ => risp}/52/network_tool.txt (100%) rename testing/{ => risp}/52/processor.sh (100%) rename testing/{ => risp}/52/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/01/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/01/label.txt (100%) rename {vrisp_testing => testing/vrisp}/01/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/01/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/01/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/02/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/02/label.txt (100%) rename {vrisp_testing => testing/vrisp}/02/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/02/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/02/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/03/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/03/label.txt (100%) rename {vrisp_testing => testing/vrisp}/03/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/03/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/03/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/04/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/04/label.txt (100%) rename {vrisp_testing => testing/vrisp}/04/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/04/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/04/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/05/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/05/label.txt (100%) rename {vrisp_testing => testing/vrisp}/05/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/05/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/05/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/06/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/06/label.txt (100%) rename {vrisp_testing => testing/vrisp}/06/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/06/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/06/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/07/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/07/label.txt (100%) rename {vrisp_testing => testing/vrisp}/07/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/07/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/07/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/08/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/08/label.txt (100%) rename {vrisp_testing => testing/vrisp}/08/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/08/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/08/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/09/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/09/label.txt (100%) rename {vrisp_testing => testing/vrisp}/09/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/09/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/09/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/10/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/10/label.txt (100%) rename {vrisp_testing => testing/vrisp}/10/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/10/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/10/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/11/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/11/label.txt (100%) rename {vrisp_testing => testing/vrisp}/11/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/11/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/11/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/12/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/12/label.txt (100%) rename {vrisp_testing => testing/vrisp}/12/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/12/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/12/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/13/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/13/label.txt (100%) rename {vrisp_testing => testing/vrisp}/13/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/13/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/13/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/14/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/14/label.txt (100%) rename {vrisp_testing => testing/vrisp}/14/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/14/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/14/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/15/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/15/label.txt (100%) rename {vrisp_testing => testing/vrisp}/15/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/15/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/15/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/16/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/16/label.txt (100%) rename {vrisp_testing => testing/vrisp}/16/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/16/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/16/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/17/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/17/label.txt (100%) rename {vrisp_testing => testing/vrisp}/17/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/17/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/17/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/18/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/18/label.txt (100%) rename {vrisp_testing => testing/vrisp}/18/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/18/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/18/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/19/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/19/label.txt (100%) rename {vrisp_testing => testing/vrisp}/19/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/19/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/19/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/20/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/20/label.txt (100%) rename {vrisp_testing => testing/vrisp}/20/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/20/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/20/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/21/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/21/label.txt (100%) rename {vrisp_testing => testing/vrisp}/21/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/21/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/21/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/22/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/22/label.txt (100%) rename {vrisp_testing => testing/vrisp}/22/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/22/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/22/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/23/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/23/label.txt (100%) rename {vrisp_testing => testing/vrisp}/23/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/23/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/23/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/24/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/24/label.txt (100%) rename {vrisp_testing => testing/vrisp}/24/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/24/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/24/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/25/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/25/label.txt (100%) rename {vrisp_testing => testing/vrisp}/25/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/25/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/25/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/26/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/26/label.txt (100%) rename {vrisp_testing => testing/vrisp}/26/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/26/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/26/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/28/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/28/label.txt (100%) rename {vrisp_testing => testing/vrisp}/28/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/28/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/28/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/33/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/33/label.txt (100%) rename {vrisp_testing => testing/vrisp}/33/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/33/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/33/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/34/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/34/label.txt (100%) rename {vrisp_testing => testing/vrisp}/34/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/34/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/34/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/35/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/35/label.txt (100%) rename {vrisp_testing => testing/vrisp}/35/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/35/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/35/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/36/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/36/label.txt (100%) rename {vrisp_testing => testing/vrisp}/36/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/36/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/36/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/37/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/37/label.txt (100%) rename {vrisp_testing => testing/vrisp}/37/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/37/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/37/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/38/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/38/label.txt (100%) rename {vrisp_testing => testing/vrisp}/38/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/38/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/38/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/39/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/39/label.txt (100%) rename {vrisp_testing => testing/vrisp}/39/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/39/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/39/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/40/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/40/label.txt (100%) rename {vrisp_testing => testing/vrisp}/40/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/40/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/40/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/41/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/41/label.txt (100%) rename {vrisp_testing => testing/vrisp}/41/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/41/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/41/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/42/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/42/label.txt (100%) rename {vrisp_testing => testing/vrisp}/42/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/42/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/42/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/43/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/43/label.txt (100%) rename {vrisp_testing => testing/vrisp}/43/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/43/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/43/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/44/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/44/label.txt (100%) rename {vrisp_testing => testing/vrisp}/44/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/44/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/44/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/45/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/45/label.txt (100%) rename {vrisp_testing => testing/vrisp}/45/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/45/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/45/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/46/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/46/label.txt (100%) rename {vrisp_testing => testing/vrisp}/46/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/46/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/46/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/47/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/47/label.txt (100%) rename {vrisp_testing => testing/vrisp}/47/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/47/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/47/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/48/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/48/label.txt (100%) rename {vrisp_testing => testing/vrisp}/48/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/48/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/48/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/49/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/49/label.txt (100%) rename {vrisp_testing => testing/vrisp}/49/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/49/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/49/processor_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/50/correct_output.txt (100%) rename {vrisp_testing => testing/vrisp}/50/label.txt (100%) rename {vrisp_testing => testing/vrisp}/50/network_tool.txt (100%) rename {vrisp_testing => testing/vrisp}/50/processor.sh (100%) rename {vrisp_testing => testing/vrisp}/50/processor_tool.txt (100%) diff --git a/include/izhikevich.hpp b/include/izhikevich.hpp new file mode 100644 index 0000000..68225e8 --- /dev/null +++ b/include/izhikevich.hpp @@ -0,0 +1,178 @@ +#include +#include +#include +#include "framework.hpp" +#include "nlohmann/json.hpp" + +namespace izhikevich { + + class Synapse; + class Network; + + class Neuron { + public: + + double v; + double u; + + double a; + double b; + double c; + double d; + + double input; + + int id; + + bool tracking; + int last_fire_time; + int fire_count; + std::vector fire_times; + + neuro::Node* node; + + std::vector synapses; + + Neuron(neuro::Node* node, int id); + ~Neuron(); + + void update(); + void fire(Network* net, int time); + void reset(); + }; + + class Synapse { + public: + Neuron* to; + int weight; + int delay; + + Synapse(Neuron* to, neuro::Edge* edge, bool exc); + }; + + class Network { + public: + std::vector inputs; + std::vector outputs; + std::vector neurons; + std::unordered_map ids; + + int timestep; + long long total_fire_count; + long long total_accumulate_count; + + /* Events have the form . */ + + std::deque< std::vector< std::pair > > events; + + Network(neuro::Network* network); + ~Network(); + + void run(int duration); + Neuron* get_neuron(uint32_t node_id); + Neuron* get_output(int output_id); + void reset(); + }; + + class Processor : public neuro::Processor { + public: + static nlohmann::json spec; + neuro::PropertyPack ppack; + nlohmann::json properties; + nlohmann::json params; + int input_scaling_value; + + std::unordered_map networks; + + Processor(nlohmann::json& arg); + ~Processor(); + + bool load_network(neuro::Network* network, int network_id = 0); + bool load_networks(std::vector &networks); + + void clear(int network_id = 0); + + void apply_spike( + const neuro::Spike& spike, + bool normalized = true, + int network_id = 0 + ); + + void apply_spike( + const neuro::Spike &spike, + const std::vector& network_ids, + bool normalized = true + ); + + void apply_spikes( + const std::vector& spikes, + bool normalized = true, + int network_id = 0 + ); + + void apply_spikes( + const std::vector& spikes, + const std::vector& network_ids, + bool normalized = true + ); + + void run(double duration, int network_id = 0); + void run(double duration, const std::vector& network_ids); + + double get_time(int network_id = 0); + + bool track_output_events( + int output_id, + bool track = true, + int network_id = 0 + ); + + bool track_neuron_events( + uint32_t node_id, + bool track = true, + int network_id = 0 + ); + + double output_last_fire(int output_id, int network_id = 0); + std::vector output_last_fires(int network_id = 0); + int output_count(int output_id, int network_id = 0); + std::vector output_counts(int network_id = 0); + + std::vector output_vector( + int output_id, + int network_id = 0 + ); + + std::vector< std::vector > output_vectors( + int network_id = 0 + ); + + long long total_neuron_counts(int network_id = 0); + long long total_neuron_accumulates(int network_id = 0); + std::vector neuron_counts(int network_id = 0); + std::vector neuron_last_fires(int network_id = 0); + + std::vector< std::vector > neuron_vectors( + int network_id = 0 + ); + + std::vector neuron_charges(int network_id = 0); + + void synapse_weights( + std::vector& pres, + std::vector& posts, + std::vector& vals, + int network_id = 0 + ); + + void clear_activity(int network_id = 0); + + neuro::PropertyPack get_network_properties() const; + nlohmann::json get_processor_properties() const; + nlohmann::json get_params() const; + + std::string get_name() const; + + Network* get_network(int network_id); + }; +} diff --git a/makefile b/makefile index 531d8b0..6ce7d30 100644 --- a/makefile +++ b/makefile @@ -31,11 +31,15 @@ VRISP_RVV_FULL_OBJ = obj/vrisp_rvv_full.o obj/vrisp_static.o VRISP_RVV_FIRED_OBJ = obj/vrisp_rvv_fired.o obj/vrisp_static.o VRISP_RVV_SYNAPSES_OBJ = obj/vrisp_rvv_synapses.o obj/vrisp_static.o +IZH_INC = include/izhikevich.hpp +IZH_OBJ = obj/izhikevich.o obj/izhikevich_static.o + all: lib/libframework.a \ bin/network_tool \ bin/compose_networks \ bin/processor_tool_risp \ bin/processor_tool_vrisp \ + bin/processor_tool_izhikevich \ bin/network_to_jgraph \ riscv_vector: all \ @@ -84,6 +88,9 @@ bin/processor_tool_vrisp_vector_fired: src/processor_tool.cpp $(FR_INC) $(VRISP_ bin/processor_tool_vrisp_vector_synapses: src/processor_tool.cpp $(FR_INC) $(VRISP_INC) $(VRISP_RVV_SYNAPSES_OBJ) $(FR_LIB) $(CXX) $(FR_CFLAGS) -o bin/processor_tool_vrisp_vector_synapses src/processor_tool.cpp $(VRISP_RVV_SYNAPSES_OBJ) $(FR_LIB) +bin/processor_tool_izhikevich: src/processor_tool.cpp $(FR_INC) $(IZH_INC) $(IZH_OBJ) $(FR_LIB) + $(CXX) $(FR_CFLAGS) -o bin/processor_tool_izhikevich src/processor_tool.cpp $(IZH_OBJ) $(FR_LIB) + # ------------------------------------------------------------ # Auxiliary Programs @@ -123,6 +130,12 @@ obj/vrisp_rvv_synapses.o: src/vrisp.cpp $(FR_INC) $(VRISP_INC) obj/vrisp_static.o: src/vrisp_static.cpp $(FR_INC) $(VRISP_INC) $(CXX) -c $(FR_CFLAGS) -o obj/vrisp_static.o src/vrisp_static.cpp +obj/izhikevich.o: src/izhikevich.cpp $(FR_INC) $(IZH_INC) + $(CXX) -c $(FR_CFLAGS) -o obj/izhikevich.o src/izhikevich.cpp + +obj/izhikevich_static.o: src/izhikevich_static.cpp $(FR_INC) $(IZH_INC) + $(CXX) -c $(FR_CFLAGS) -o obj/izhikevich_static.o src/izhikevich_static.cpp + obj/framework.o: src/framework.cpp $(FR_INC) $(CXX) -c $(FR_CFLAGS) -o obj/framework.o src/framework.cpp diff --git a/scripts/test_izhikevich.sh b/scripts/test_izhikevich.sh new file mode 100644 index 0000000..d7f06bd --- /dev/null +++ b/scripts/test_izhikevich.sh @@ -0,0 +1,97 @@ +# Script to test the network tool and RISP processor tool + +if [ $# -ne 2 ]; then + echo 'usage: sh scripts/test_izhikevich.sh number('-' for all) yes|no(keep temporary files)' >&2 + exit 1 +fi + +keep="$2" +if [ "$keep" != yes -a "$keep" != no ]; then + echo 'keep parameter must be "yes" or "no".' >&2 + exit 1 +fi + +t="$1" + +if [ T"$t" = 'T-' ]; then + t=`ls testing/izhikevich` +fi + +# Make the two executables if they aren't made yet. + +for i in bin/network_tool bin/processor_tool_izhikevich ; do + if [ ! -x $i ]; then make $i ; fi +done + +for i in $t ; do + i=`echo $i | awk '{ printf "%02d\n", $1 }'` + if [ ! -d testing/izhikevich/$i ]; then + echo "Error -- no directory testing/izhikevich/$i" >&2 + exit 1 + fi + + for f in label.txt network_tool.txt processor.sh processor_tool.txt correct_output.txt ; do + if [ ! -f testing/izhikevich/$i/$f ]; then + echo "Error -- no file testing/izhikevich/$i/$f" >&2 + exit 1 + fi + done + + # Create the processor params, and then an empty network + + l=`cat testing/izhikevich/$i/label.txt` + sh testing/izhikevich/$i/processor.sh > tmp_proc_params.txt + + ( echo M izhikevich tmp_proc_params.txt + echo EMPTYNET tmp_empty_network.txt ) | bin/processor_tool_izhikevich + + # Use network_tool.txt to create the network. + + bin/network_tool < testing/izhikevich/$i/network_tool.txt > tmp_nt_output.txt 2>&1 + if [ `wc tmp_nt_output.txt | awk '{ print $1 }'` != 0 ]; then + echo "Test $i - $l" >&2 + echo "There was an error in the network_tool command when I ran:" >&2 + echo "" >&2 + echo "bin/network_tool < testing/izhikevich/$i/network_tool.txt > tmp_nt_output.txt" >&2 + echo "" >&2 + cat tmp_nt_output.txt >&2 + exit 1 + fi + + # Now, you'll execute the commands in processor_tool.txt and compare the output + # against known output. + + cp testing/izhikevich/$i/processor_tool.txt tmp_pt_input.txt + + bin/processor_tool_izhikevich < testing/izhikevich/$i/processor_tool.txt > tmp_pt_output.txt 2> tmp_pt_error.txt + if [ `wc tmp_pt_error.txt | awk '{ print $1 }'` != 0 ]; then + echo "Test $i - $l" >&2 + echo "There was an error in the processor_tool_izhikevich command when I ran:" >&2 + echo "" >&2 + echo "bin/processor_tool_izhikevich < testing/izhikevich/$i/processor_tool.txt" >&2 + echo "" >&2 + cat tmp_pt_error.txt >&2 + exit 1 + fi + + d=`diff tmp_pt_output.txt testing/izhikevich/$i/correct_output.txt | wc | awk '{ print $1 }'` + if [ $d != 0 ]; then + echo "Test $i - $l" >&2 + echo "Error: Output does not match the correct output." >&2 + echo " Output file is tmp_pt_output.txt" >&2 + echo " Correct output file is testing/izhikevich/$i/correct_output.txt" >&2 + exit 1 + fi + + echo "Passed Test $i - $l" + if [ $keep = no ]; then + rm -f tmp_proc_params.txt \ + tmp_network.txt \ + tmp_nt_output.txt \ + tmp_pt_output.txt \ + tmp_pt_input.txt \ + tmp_pt_error.txt \ + tmp_empty_network.txt + fi + +done diff --git a/scripts/test_risp.sh b/scripts/test_risp.sh index 9aabcf9..d56f1da 100644 --- a/scripts/test_risp.sh +++ b/scripts/test_risp.sh @@ -14,7 +14,7 @@ fi t="$1" if [ T"$t" = 'T-' ]; then - t=`ls testing` + t=`ls testing/risp` fi # Make the two executables if they aren't made yet. @@ -25,34 +25,34 @@ done for i in $t ; do i=`echo $i | awk '{ printf "%02d\n", $1 }'` - if [ ! -d testing/$i ]; then - echo "Error -- no directory testing/$i" >&2 + if [ ! -d testing/risp/$i ]; then + echo "Error -- no directory testing/risp/$i" >&2 exit 1 fi for f in label.txt network_tool.txt processor.sh processor_tool.txt correct_output.txt ; do - if [ ! -f testing/$i/$f ]; then - echo "Error -- no file testing/$i/$f" >&2 + if [ ! -f testing/risp/$i/$f ]; then + echo "Error -- no file testing/risp/$i/$f" >&2 exit 1 fi done # Create the processor params, and then an empty network - l=`cat testing/$i/label.txt` - sh testing/$i/processor.sh > tmp_proc_params.txt + l=`cat testing/risp/$i/label.txt` + sh testing/risp/$i/processor.sh > tmp_proc_params.txt ( echo M risp tmp_proc_params.txt echo EMPTYNET tmp_empty_network.txt ) | bin/processor_tool_risp # Use network_tool.txt to create the network. - bin/network_tool < testing/$i/network_tool.txt > tmp_nt_output.txt 2>&1 + bin/network_tool < testing/risp/$i/network_tool.txt > tmp_nt_output.txt 2>&1 if [ `wc tmp_nt_output.txt | awk '{ print $1 }'` != 0 ]; then echo "Test $i - $l" >&2 echo "There was an error in the network_tool command when I ran:" >&2 echo "" >&2 - echo "bin/network_tool < testing/$i/network_tool.txt > tmp_nt_output.txt" >&2 + echo "bin/network_tool < testing/risp/$i/network_tool.txt > tmp_nt_output.txt" >&2 echo "" >&2 cat tmp_nt_output.txt >&2 exit 1 @@ -61,25 +61,25 @@ for i in $t ; do # Now, you'll execute the commands in processor_tool.txt and compare the output # against known output. - cp testing/$i/processor_tool.txt tmp_pt_input.txt + cp testing/risp/$i/processor_tool.txt tmp_pt_input.txt - bin/processor_tool_risp < testing/$i/processor_tool.txt > tmp_pt_output.txt 2> tmp_pt_error.txt + bin/processor_tool_risp < testing/risp/$i/processor_tool.txt > tmp_pt_output.txt 2> tmp_pt_error.txt if [ `wc tmp_pt_error.txt | awk '{ print $1 }'` != 0 ]; then echo "Test $i - $l" >&2 echo "There was an error in the processor_tool_risp command when I ran:" >&2 echo "" >&2 - echo "bin/processor_tool_risp < testing/$i/processor_tool.txt" >&2 + echo "bin/processor_tool_risp < testing/risp/$i/processor_tool.txt" >&2 echo "" >&2 cat tmp_pt_error.txt >&2 exit 1 fi - d=`diff tmp_pt_output.txt testing/$i/correct_output.txt | wc | awk '{ print $1 }'` + d=`diff tmp_pt_output.txt testing/risp/$i/correct_output.txt | wc | awk '{ print $1 }'` if [ $d != 0 ]; then echo "Test $i - $l" >&2 echo "Error: Output does not match the correct output." >&2 echo " Output file is tmp_pt_output.txt" >&2 - echo " Correct output file is testing/$i/correct_output.txt" >&2 + echo " Correct output file is testing/risp/$i/correct_output.txt" >&2 exit 1 fi diff --git a/scripts/test_vrisp.sh b/scripts/test_vrisp.sh index 6c07213..f456ead 100644 --- a/scripts/test_vrisp.sh +++ b/scripts/test_vrisp.sh @@ -14,7 +14,7 @@ fi t="$1" if [ T"$t" = 'T-' ]; then - t=`ls vrisp_testing` + t=`ls testing/vrisp` fi # Make the two executables if they aren't made yet. @@ -25,34 +25,34 @@ done for i in $t ; do i=`echo $i | awk '{ printf "%02d\n", $1 }'` - if [ ! -d vrisp_testing/$i ]; then - echo "Error -- no directory vrisp_testing/$i" >&2 + if [ ! -d testing/vrisp/$i ]; then + echo "Error -- no directory testing/vrisp/$i" >&2 exit 1 fi for f in label.txt network_tool.txt processor.sh processor_tool.txt correct_output.txt ; do - if [ ! -f vrisp_testing/$i/$f ]; then - echo "Error -- no file vrisp_testing/$i/$f" >&2 + if [ ! -f testing/vrisp/$i/$f ]; then + echo "Error -- no file testing/vrisp/$i/$f" >&2 exit 1 fi done # Create the processor params, and then an empty network - l=`cat vrisp_testing/$i/label.txt` - sh vrisp_testing/$i/processor.sh > tmp_proc_params.txt + l=`cat testing/vrisp/$i/label.txt` + sh testing/vrisp/$i/processor.sh > tmp_proc_params.txt ( echo M vrisp tmp_proc_params.txt echo EMPTYNET tmp_empty_network.txt ) | bin/processor_tool_vrisp # Use network_tool.txt to create the network. - bin/network_tool < vrisp_testing/$i/network_tool.txt > tmp_nt_output.txt 2>&1 + bin/network_tool < testing/vrisp/$i/network_tool.txt > tmp_nt_output.txt 2>&1 if [ `wc tmp_nt_output.txt | awk '{ print $1 }'` != 0 ]; then echo "Test $i - $l" >&2 echo "There was an error in the network_tool command when I ran:" >&2 echo "" >&2 - echo "bin/network_tool < vrisp_testing/$i/network_tool.txt > tmp_nt_output.txt" >&2 + echo "bin/network_tool < testing/vrisp/$i/network_tool.txt > tmp_nt_output.txt" >&2 echo "" >&2 cat tmp_nt_output.txt >&2 exit 1 @@ -61,26 +61,26 @@ for i in $t ; do # Now, you'll execute the commands in processor_tool.txt and compare the output # against known output. - cp vrisp_testing/$i/processor_tool.txt tmp_pt_input.txt + cp testing/vrisp/$i/processor_tool.txt tmp_pt_input.txt - bin/processor_tool_vrisp < vrisp_testing/$i/processor_tool.txt > tmp_pt_output.txt 2> tmp_pt_error.txt + bin/processor_tool_vrisp < testing/vrisp/$i/processor_tool.txt > tmp_pt_output.txt 2> tmp_pt_error.txt if [ `wc tmp_pt_error.txt | awk '{ print $1 }'` != 0 ]; then echo "Test $i - $l" >&2 echo "There was an error in the processor_tool_risp command when I ran:" >&2 echo "" >&2 - echo "bin/processor_tool_vrisp < vrisp_testing/$i/processor_tool.txt" >&2 + echo "bin/processor_tool_vrisp < testing/vrisp/$i/processor_tool.txt" >&2 echo "" >&2 cat tmp_pt_error.txt >&2 exit 1 fi - d=`diff tmp_pt_output.txt vrisp_testing/$i/correct_output.txt | wc | awk '{ print $1 }'` + d=`diff tmp_pt_output.txt testing/vrisp/$i/correct_output.txt | wc | awk '{ print $1 }'` if [ $d != 0 ]; then echo "Test $i - $l" >&2 echo "Error: Output does not match the correct output." >&2 echo " Output file is tmp_pt_output.txt" >&2 - echo " Correct output file is vrisp_testing/$i/correct_output.txt" >&2 + echo " Correct output file is testing/vrisp/$i/correct_output.txt" >&2 exit 1 fi diff --git a/src/izhikevich.cpp b/src/izhikevich.cpp new file mode 100644 index 0000000..19add15 --- /dev/null +++ b/src/izhikevich.cpp @@ -0,0 +1,936 @@ +#include "izhikevich.hpp" +#include "utils/json_helpers.hpp" + +using namespace std; +using namespace izhikevich; + +using neuro::Node; +using neuro::Edge; +using neuro::Spike; +using neuro::Property; +using neuro::PropertyPack; +using neuro::Parameter_Check_Json_T; +using nlohmann::json; + +typedef runtime_error SRE; + +json Processor::spec = { + + { "min_excitatory_weight", "I" }, + { "max_excitatory_weight", "I" }, + { "min_inhibitory_weight", "I" }, + { "max_inhibitory_weight", "I" }, + + { "min_excitatory_delay", "I" }, + { "max_excitatory_delay", "I" }, + { "min_inhibitory_delay", "I" }, + { "max_inhibitory_delay", "I" }, + + { "input_scaling_value", "I" } +}; + +Neuron::Neuron(Node* node, int id) +{ + if (!node) { + throw (string) "bad node: null pointer"; + } + + /* Regular spiking or RS (excitatory) neuron. */ + + if (node->get("exc")) { + v = -65; + u = -13; + a = 0.02; + b = 0.2; + c = -65; + d = 8; + + /* Fast spiking or FS (inhibitory) neuron. */ + + } else { + v = -65; + u = -13; + a = 0.1; + b = 0.2; + c = -65; + d = 2; + } + + this->id = id; + this->node = node; + + input = 0; + + fire_count = 0; + tracking = false; + last_fire_time = -1; +} + +void Neuron::update() +{ + v += 0.04 * v * v + 5 * v + 140 - u + input; + u += a * (b * v - u); +} + +void Neuron::fire(Network* net, int time) +{ + size_t i; + Synapse* s; + pair p; + + /* Send a spike along each of the outgoing + synapses. */ + + for (i = 0; i < synapses.size(); i++) { + s = synapses[i]; + if (s->delay >= (int) net->events.size()) { + net->events.resize(s->delay + 1); + } + p = make_pair(s->to->id, s->weight); + net->events[s->delay].push_back(p); + } + + /* "Reset" neuron. */ + + v = c; + u += d; + + fire_count++; + last_fire_time = time; + if (tracking) fire_times.push_back(time); +} + +Neuron::~Neuron() +{ + size_t i; + + for (i = 0; i < synapses.size(); i++) { + delete synapses[i]; + } +} + +void Neuron::reset() +{ + v = -65; + u = -13; + + input = 0; + + fire_count = 0; + last_fire_time = -1; + fire_times.clear(); +} + +Synapse::Synapse(Neuron* to, Edge* edge, bool exc) +{ + if (!edge) { + throw (string) "bad edge: null pointer"; + } + + /* Which params we use depends on whether the + synapse is excitatory or inhibitory, which + depends on whether the presynaptic neuron is + excitatory or inhibitory. Excitatory neurons + have only excitatory (outgoing) synapses, and + similarly for inhibitory neurons. */ + + if (exc) { + weight = edge->get("excitatory_weight"); + delay = edge->get("excitatory_delay"); + } else { + weight = edge->get("inhibitory_weight"); + delay = edge->get("inhibitory_delay"); + } + + this->to = to; +} + +Network::Network(neuro::Network* net) +{ + bool exc; + size_t i, j; + Node* n; + Edge* e; + Neuron* to; + + net->make_sorted_node_vector(); + neurons.resize(net->num_nodes()); + + /* Creating the neurons. */ + + for (i = 0; i < net->sorted_node_vector.size(); i++) { + n = net->sorted_node_vector[i]; + ids[n->id] = i; + neurons[i] = new Neuron(n, i); + if (n->is_input()) inputs.push_back(i); + if (n->is_output()) outputs.push_back(i); + } + + /* Creating the synapses. */ + + for (i = 0; i < net->sorted_node_vector.size(); i++) { + n = net->sorted_node_vector[i]; + for (j = 0; j < n->outgoing.size(); j++) { + e = n->outgoing[j]; + to = neurons[ids[e->to->id]]; + exc = neurons[i]->node->get("exc"); + neurons[i]->synapses.push_back(new Synapse(to, e, exc)); + } + } + + timestep = 0; + total_fire_count = 0; + total_accumulate_count = 0; +} + +Network::~Network() +{ + size_t i; + + for (i = 0; i < neurons.size(); i++) { + delete neurons[i]; + } +} + +void Network::run(int duration) +{ + int i; + size_t j; + + /* Reset all the tracking info. */ + + for (i = 0; i < (int) neurons.size(); i++) { + neurons[i]->fire_count = 0; + neurons[i]->last_fire_time = -1; + neurons[i]->fire_times.clear(); + } + + /* Simulate for "duration" time steps. */ + + for (i = 0; i < duration; i++) { + + /* Process neuron fires. */ + + for (j = 0; j < neurons.size(); j++) { + if (neurons[j]->v >= 30) { + neurons[j]->fire(this, i); + total_accumulate_count += neurons[j]->synapses.size(); + total_fire_count++; + } + } + + /* Process input spikes and spikes from synapses. */ + + if (!events.empty()) { + for (j = 0; j < events[0].size(); j++) { + neurons[events[0][j].first]->input += events[0][j].second; + } + events.pop_front(); + } + + /* Update the neurons. */ + + for (j = 0; j < neurons.size(); j++) { + neurons[j]->update(); + neurons[j]->input = 0; + } + } + + timestep += duration; +} + +Neuron* Network::get_neuron(uint32_t node_id) +{ + char buf[20]; + unordered_map::const_iterator it; + + it = ids.find(node_id); + + if (it == ids.end()) { + snprintf(buf, 20, "%d", node_id); + throw (string) "bad node id: " + buf; + } + + return neurons[it->second]; +} + +Neuron* Network::get_output(int output_id) +{ + char buf[20]; + + if (output_id < 0 || output_id >= (int) outputs.size()) { + snprintf(buf, 20, "%d", output_id); + throw (string) "bad output id: " + buf; + } + + return neurons[outputs[output_id]]; +} + +void Network::reset() +{ + size_t i; + + for (i = 0; i < neurons.size(); i++) { + neurons[i]->reset(); + } + + events.clear(); + total_fire_count = 0; + total_accumulate_count = 0; + timestep = 0; +} + +Processor::Processor(json& arg) +{ + string s; + json::const_iterator jit; + + try { + Parameter_Check_Json_T(arg, spec); + } catch (const SRE& e) { + s = (string) "izhikevich::Processor::Processor(): " + e.what(); + throw SRE(s); + } + + /* These default values may not be appropriate for + all applications, encoding strategies, etc. They + reflect to some degree what Izhikevich has in his + MATLAB codes (which reflects a particular use case, + i.e., application). You can use the bayes utility + in our framework, for example, to try to optimize + these (along with the encoding strategy, etc., for + your particular application. */ + + params = json::object(); + + params["min_excitatory_weight"] = 1; + params["max_excitatory_weight"] = 40; + params["min_inhibitory_weight"] = -20; + params["max_inhibitory_weight"] = -1; + + params["min_excitatory_delay"] = 1; + params["max_excitatory_delay"] = 20; + params["min_inhibitory_delay"] = 1; + params["max_inhibitory_delay"] = 1; + + params["input_scaling_value"] = 40; + + /* Overwrite the default values with any values + specified in the param file. */ + + for (jit = arg.begin(); jit != arg.end(); jit++) { + params[jit.key()] = arg[jit.key()]; + } + + /* Sanity check the param values. (I'm using else if's + rather than if's because it looks nicer.) */ + + try { + + if (!params["min_excitatory_weight"].is_number_integer() || + params["min_excitatory_weight"] < 1) { + throw (string) "bad parameter: \"min_excitatory_weight\": must " + "be a positive integer"; + } else if (!params["max_excitatory_weight"].is_number_integer() || + params["max_excitatory_weight"] < 1) { + throw (string) "bad parameter: \"max_excitatory_weight\": must " + "be a positive integer"; + + } else if (!params["min_inhibitory_weight"].is_number_integer() || + params["min_inhibitory_weight"] > -1) { + throw (string) "bad parameter: \"min_inhibitory_weight\": must " + "be a negative integer"; + } else if (!params["max_inhibitory_weight"].is_number_integer() || + params["max_inhibitory_weight"] > -1) { + throw (string) "bad parameter: \"max_inhibitory_weight\": must " + "be a negative integer"; + + } else if (!params["min_excitatory_delay"].is_number_integer() || + params["min_excitatory_delay"] < 1) { + throw (string) "bad parameter: \"min_excitatory_delay\": must " + "be a positive integer"; + } else if (!params["max_excitatory_delay"].is_number_integer() || + params["max_excitatory_delay"] < 1) { + throw (string) "bad parameter: \"max_excitatory_delay\": must " + "be a positive integer"; + + } else if (!params["min_inhibitory_delay"].is_number_integer() || + params["min_inhibitory_delay"] < 1) { + throw (string) "bad parameter: \"min_inhibitory_delay\": must " + "be a positive integer"; + } else if (!params["max_inhibitory_delay"].is_number_integer() || + params["max_inhibitory_delay"] < 1) { + throw (string) "bad parameter: \"max_inhibitory_delay\": must " + "be a positive integer"; + + } else if (params["min_excitatory_weight"] > + params["max_excitatory_weight"]) { + throw (string) "bad parameter: \"min_excitatory_weight\": must " + "be less than or equal to " + "\"max_excitatory_weight\""; + } else if (params["min_inhibitory_weight"] > + params["max_inhibitory_weight"]) { + throw (string) "bad parameter: \"min_inhibitory_weight\": must " + "be less than or equal to " + "\"max_inhibitory_weight\""; + + } else if (params["min_excitatory_delay"] > + params["max_excitatory_delay"]) { + throw (string) "bad parameter: \"min_excitatory_delay\": must " + "be less than or equal to " + "\"max_excitatory_delay\""; + } else if (params["min_inhibitory_delay"] > + params["max_inhibitory_delay"]) { + throw (string) "bad parameter: \"min_inhibitory_delay\": must " + "be less than or equal to " + "\"max_inhibitory_delay\""; + } + } catch (const string &s2) { + throw SRE("izhikevich::Processor::Processor(): " + s2); + } + + input_scaling_value = params["input_scaling_value"]; + + properties = json::object(); + properties["threshold_inclusive"] = true; + properties["input_scaling_value"] = input_scaling_value; + properties["binary_input"] = false; + properties["spike_raster_info"] = true; + properties["plasticity"] = "none"; + properties["run_time_inclusive"] = false; + + /* We have an integration delay because a + neuron that fires at time t actually has + its charge reach 30 or more at time t - 1, + but we don't learn about it until time t. */ + + properties["integration_delay"] = true; + + /* "exc" is whether a neuron is excitatory + or inhibitory. */ + + ppack.add_node_property("exc", 0, 1, Property::Type::BOOLEAN); + + /* Having weights be integers at least for now. */ + + ppack.add_edge_property("excitatory_weight", + params["min_excitatory_weight"], + params["max_excitatory_weight"], + Property::Type::INTEGER); + ppack.add_edge_property("inhibitory_weight", + params["min_inhibitory_weight"], + params["max_inhibitory_weight"], + Property::Type::INTEGER); + + ppack.add_edge_property("excitatory_delay", + params["min_excitatory_delay"], + params["max_excitatory_delay"], + Property::Type::INTEGER); + ppack.add_edge_property("inhibitory_delay", + params["min_inhibitory_delay"], + params["max_inhibitory_delay"], + Property::Type::INTEGER); +} + +Processor::~Processor() +{ + unordered_map::iterator it; + + for (it = networks.begin(); it != networks.end(); it++) { + delete it->second; + } +} + +bool Processor::load_network(neuro::Network* network, int network_id) +{ + string s; + + try { + if (!network) { + throw (string) "bad network: null pointer"; + } + + if (network->get_properties().as_json() != ppack.as_json()) { + throw (string) "bad network: network and processor properties " + "do not match"; + } + + clear(network_id); + networks[network_id] = new Network(network); + } catch (const string& s) { + throw SRE("izhikevich::Processor::load_network(): " + s); + } + + return true; +} + +bool Processor::load_networks(vector& networks) +{ + size_t i; + + for (i = 0; i < networks.size(); i++) { + load_network(networks[i], i); + } + + return true; +} + +void Processor::clear(int network_id) +{ + unordered_map::iterator it; + + it = networks.find(network_id); + + if (it != networks.end()) { + networks.erase(it); + } +} + +void Processor::apply_spike( + const Spike& spike, + bool normalized, + int network_id) +{ + char buf[20]; + double val; + string s; + Network* net; + pair p; + + try { + + net = get_network(network_id); + + /* Am I right in the thought that spike.id + is an input id and not the node id? */ + + if (spike.id < 0 || spike.id >= (int) net->inputs.size()) { + snprintf(buf, 20, "%d", spike.id); + throw (string) "bad input id: " + buf; + } + + if (spike.time < 0) { + snprintf(buf, 20, "%lf", spike.time); + throw (string) "bad spike time: " + buf; + } + + if (normalized) { + if (spike.value < 0 || spike.value > 1) { + snprintf(buf, 20, "%lf", spike.value); + throw (string) "bad spike value: " + buf + ": " + "value must be in [0, 1]"; + } + val = spike.value * input_scaling_value; + } else { + val = spike.value; + } + } catch (const string& s) { + throw SRE("izhikevich::Processor::apply_spike(): " + s); + } + + if (spike.time >= (int) net->events.size()) { + net->events.resize(spike.time + 1); + } + p = make_pair(net->inputs[spike.id], val); + net->events[spike.time].push_back(p); +} + +void Processor::apply_spike( + const Spike& spike, + const vector& network_ids, + bool normalized) +{ + size_t i; + + for (i = 0; i < network_ids.size(); i++) { + apply_spike(spike, normalized, network_ids[i]); + } +} + +void Processor::apply_spikes( + const vector& spikes, + bool normalized, + int network_id) +{ + size_t i; + + for (i = 0; i < spikes.size(); i++) { + apply_spike(spikes[i], normalized, network_id); + } +} + +void Processor::apply_spikes( + const vector& spikes, + const vector& network_ids, + bool normalized) +{ + size_t i; + + for (i = 0; i < spikes.size(); i++) { + apply_spike(spikes[i], network_ids, normalized); + } +} + +void Processor::run(double duration, int network_id) +{ + Network* net; + + /* Run calls with a duration less than or equal to + zero do not affect the network state. */ + + if (duration <= 0) return; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::run(): " + s); + } + + net->run(duration); +} + +void Processor::run(double duration, const vector& network_ids) +{ + size_t i; + + for (i = 0; i < network_ids.size(); i++) { + run(duration, network_ids[i]); + } +} + +double Processor::get_time(int network_id) +{ + try { + return get_network(network_id)->timestep; + } catch (const string& s) { + throw SRE("izhikevich::Processor::get_time(): " + s); + } +} + +bool Processor::track_output_events( + int output_id, + bool track, + int network_id) +{ + Neuron *n; + + try { + n = get_network(network_id)->get_output(output_id); + n->tracking = track; + } catch (const string& s) { + throw SRE("izhikevich::Processor::track_output_events(): " + s); + } + + return true; +} + +bool Processor::track_neuron_events( + uint32_t node_id, + bool track, + int network_id) +{ + Neuron* n; + + try { + n = get_network(network_id)->get_neuron(node_id); + n->tracking = track; + } catch (const string& s) { + throw SRE("izhikevich::Processor::track_neuron_events(): " + s); + } + + return true; +} + +double Processor::output_last_fire(int output_id, int network_id) +{ + Neuron* n; + + try { + n = get_network(network_id)->get_output(output_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_last_fire(): " + s); + } + + return n->last_fire_time; +} + +vector Processor::output_last_fires(int network_id) +{ + size_t i; + Network* net; + vector times; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_last_fires(): " + s); + } + + times.resize(net->outputs.size()); + for (i = 0; i < net->outputs.size(); i++) { + times[i] = net->neurons[net->outputs[i]]->last_fire_time; + } + + return times; +} + +int Processor::output_count(int output_id, int network_id) +{ + Neuron* n; + + try { + n = get_network(network_id)->get_output(output_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_count(): " + s); + } + + return n->fire_count; +} + +vector Processor::output_counts(int network_id) +{ + size_t i; + Network* net; + vector counts; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_counts(): " + s); + } + + counts.resize(net->outputs.size()); + + for (i = 0; i < net->outputs.size(); i++) { + counts[i] = net->neurons[net->outputs[i]]->fire_count; + } + + return counts; +} + +vector Processor::output_vector( + int output_id, + int network_id) +{ + Neuron* n; + + try { + n = get_network(network_id)->get_output(output_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_vector(): " + s); + } + + return n->fire_times; +} + +vector< vector > Processor::output_vectors(int network_id) +{ + size_t i; + Network* net; + vector< vector > times; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::output_vectors(): " + s); + } + + times.resize(net->outputs.size()); + + for (i = 0; i < net->outputs.size(); i++) { + times[i] = net->neurons[net->outputs[i]]->fire_times; + } + + return times; +} + +long long Processor::total_neuron_counts(int network_id) +{ + long long count; + Network* net; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::total_neuron_counts(): " + s); + } + + count = net->total_fire_count; + net->total_fire_count = 0; + return count; +} + +long long Processor::total_neuron_accumulates(int network_id) +{ + long long count; + string s; + Network* net; + + try { + net = get_network(network_id); + } catch (const string& s2) { + s = "izhikevich::Processor::total_neuron_accumulates(): " + s; + throw SRE(s); + } + + count = net->total_accumulate_count; + net->total_accumulate_count = 0; + return count; +} + +vector Processor::neuron_counts(int network_id) +{ + size_t i; + Network* net; + vector counts; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::neuron_counts(): " + s); + } + + counts.resize(net->neurons.size()); + + for (i = 0; i < net->neurons.size(); i++) { + counts[i] = net->neurons[i]->fire_count; + } + + return counts; +} + +vector Processor::neuron_last_fires(int network_id) +{ + size_t i; + Network* net; + vector times; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::neuron_last_fires(): " + s); + } + + times.resize(net->neurons.size()); + + for (i = 0; i < net->neurons.size(); i++) { + times[i] = net->neurons[i]->last_fire_time; + } + + return times; +} + +vector< vector > Processor::neuron_vectors(int network_id) +{ + size_t i; + Network* net; + vector< vector > times; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::neuron_vectors(): " + s); + } + + times.resize(net->neurons.size()); + + for (i = 0; i < net->neurons.size(); i++) { + times[i] = net->neurons[i]->fire_times; + } + + return times; +} + +vector Processor::neuron_charges(int network_id) +{ + size_t i; + double v; + Network* net; + vector charges; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::neuron_charges(): " + s); + } + + charges.resize(net->neurons.size()); + + for (i = 0; i < net->neurons.size(); i++) { + v = net->neurons[i]->v; + charges[i] = (v > 30) ? 30 : v; + } + + return charges; +} + +void Processor::synapse_weights( + vector& pres, + vector& posts, + vector& vals, + int network_id) +{ + size_t i, j; + Network* net; + + try { + net = get_network(network_id); + } catch (const string& s) { + throw SRE("izhikevich::Processor::synapse_weights(): " + s); + } + + pres.clear(); + posts.clear(); + vals.clear(); + + for (i = 0; i < net->neurons.size(); i++) { + for (j = 0; j < net->neurons[i]->synapses.size(); j++) { + pres.push_back(net->neurons[i]->node->id); + posts.push_back(net->neurons[i]->synapses[j]->to->node->id); + vals.push_back(net->neurons[i]->synapses[j]->weight); + } + } +} + +void Processor::clear_activity(int network_id) +{ + try { + get_network(network_id)->reset(); + } catch (const string& s) { + throw SRE("izhikevich::Processor::clear_activity(): " + s); + } +} + +PropertyPack Processor::get_network_properties() const +{ + return ppack; +} + +json Processor::get_processor_properties() const +{ + return properties; +} + +json Processor::get_params() const +{ + return params; +} + +string Processor::get_name() const +{ + return "izhikevich"; +} + +Network* Processor::get_network(int network_id) +{ + char buf[20]; + unordered_map::const_iterator it; + + it = networks.find(network_id); + + if (it == networks.end()) { + snprintf(buf, 20, "%d", network_id); + throw (string) "bad network_id: " + buf; + } + return it->second; +} diff --git a/src/izhikevich_static.cpp b/src/izhikevich_static.cpp new file mode 100644 index 0000000..b42b09f --- /dev/null +++ b/src/izhikevich_static.cpp @@ -0,0 +1,18 @@ +#include +#include "izhikevich.hpp" +#include "framework.hpp" +using nlohmann::json; + +neuro::Processor *neuro::Processor::make(const string &name, json ¶ms) +{ + string es; + + if (name != "izhikevich") { + es = (string) "Processor::make() called with a name (" + + name + + (string) ") not equal to izhikevich"; + throw std::runtime_error(es); + } + + return new izhikevich::Processor(params); +} diff --git a/testing/izhikevich/01/correct_output.txt b/testing/izhikevich/01/correct_output.txt new file mode 100644 index 0000000..9466d4a --- /dev/null +++ b/testing/izhikevich/01/correct_output.txt @@ -0,0 +1,4 @@ +Node 0 charge: -65 +Node 0 last fire: -1.0 +Node 0 fire count: 0 +Node 0 fire times: diff --git a/testing/izhikevich/01/label.txt b/testing/izhikevich/01/label.txt new file mode 100644 index 0000000..07f3358 --- /dev/null +++ b/testing/izhikevich/01/label.txt @@ -0,0 +1 @@ +Validating neuron construction diff --git a/testing/izhikevich/01/network_tool.txt b/testing/izhikevich/01/network_tool.txt new file mode 100644 index 0000000..64d5b46 --- /dev/null +++ b/testing/izhikevich/01/network_tool.txt @@ -0,0 +1,5 @@ +FJ tmp_empty_network.txt + +AN 0 + +TJ tmp_network.txt diff --git a/testing/izhikevich/01/processor.sh b/testing/izhikevich/01/processor.sh new file mode 100644 index 0000000..dc2144b --- /dev/null +++ b/testing/izhikevich/01/processor.sh @@ -0,0 +1,2 @@ +echo '{ +}' diff --git a/testing/izhikevich/01/processor_tool.txt b/testing/izhikevich/01/processor_tool.txt new file mode 100644 index 0000000..ef4ede9 --- /dev/null +++ b/testing/izhikevich/01/processor_tool.txt @@ -0,0 +1,6 @@ +ML tmp_network.txt + +NCH +NLF T +NC T +NT T diff --git a/testing/izhikevich/02/correct_output.txt b/testing/izhikevich/02/correct_output.txt new file mode 100644 index 0000000..8550883 --- /dev/null +++ b/testing/izhikevich/02/correct_output.txt @@ -0,0 +1,3 @@ +Node 0 last fire: 1.0 +Node 0 fire count: 1 +Node 0 fire times: 1.0 diff --git a/testing/izhikevich/02/label.txt b/testing/izhikevich/02/label.txt new file mode 100644 index 0000000..7457091 --- /dev/null +++ b/testing/izhikevich/02/label.txt @@ -0,0 +1 @@ +Validating neuron activity bookkeeping diff --git a/testing/izhikevich/02/network_tool.txt b/testing/izhikevich/02/network_tool.txt new file mode 100644 index 0000000..e3dc629 --- /dev/null +++ b/testing/izhikevich/02/network_tool.txt @@ -0,0 +1,6 @@ +FJ tmp_empty_network.txt + +AN 0 +AI 0 + +TJ tmp_network.txt diff --git a/testing/izhikevich/02/processor.sh b/testing/izhikevich/02/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/02/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/02/processor_tool.txt b/testing/izhikevich/02/processor_tool.txt new file mode 100644 index 0000000..031e82a --- /dev/null +++ b/testing/izhikevich/02/processor_tool.txt @@ -0,0 +1,9 @@ +ML tmp_network.txt + +AS 0 0 1 + +RUN 2 + +NLF T +NC T +NT T diff --git a/testing/izhikevich/03/correct_output.txt b/testing/izhikevich/03/correct_output.txt new file mode 100644 index 0000000..6aedcb3 --- /dev/null +++ b/testing/izhikevich/03/correct_output.txt @@ -0,0 +1,2 @@ +Node 0 fire times: 1.0 +Node 1 fire times: diff --git a/testing/izhikevich/03/label.txt b/testing/izhikevich/03/label.txt new file mode 100644 index 0000000..79cd87d --- /dev/null +++ b/testing/izhikevich/03/label.txt @@ -0,0 +1 @@ +Validating neuron tracking diff --git a/testing/izhikevich/03/network_tool.txt b/testing/izhikevich/03/network_tool.txt new file mode 100644 index 0000000..4b247ce --- /dev/null +++ b/testing/izhikevich/03/network_tool.txt @@ -0,0 +1,7 @@ +FJ tmp_empty_network.txt + +AN 0 1 + +AI 0 1 + +TJ tmp_network.txt diff --git a/testing/izhikevich/03/processor.sh b/testing/izhikevich/03/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/03/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/03/processor_tool.txt b/testing/izhikevich/03/processor_tool.txt new file mode 100644 index 0000000..4626557 --- /dev/null +++ b/testing/izhikevich/03/processor_tool.txt @@ -0,0 +1,10 @@ +ML tmp_network.txt + +UNTRACK_N 1 + +AS 0 0 1 +AS 1 0 1 + +RUN 2 + +NT T diff --git a/testing/izhikevich/04/correct_output.txt b/testing/izhikevich/04/correct_output.txt new file mode 100644 index 0000000..9466d4a --- /dev/null +++ b/testing/izhikevich/04/correct_output.txt @@ -0,0 +1,4 @@ +Node 0 charge: -65 +Node 0 last fire: -1.0 +Node 0 fire count: 0 +Node 0 fire times: diff --git a/testing/izhikevich/04/label.txt b/testing/izhikevich/04/label.txt new file mode 100644 index 0000000..1ad7733 --- /dev/null +++ b/testing/izhikevich/04/label.txt @@ -0,0 +1 @@ +Validating neuron reset diff --git a/testing/izhikevich/04/network_tool.txt b/testing/izhikevich/04/network_tool.txt new file mode 100644 index 0000000..e3dc629 --- /dev/null +++ b/testing/izhikevich/04/network_tool.txt @@ -0,0 +1,6 @@ +FJ tmp_empty_network.txt + +AN 0 +AI 0 + +TJ tmp_network.txt diff --git a/testing/izhikevich/04/processor.sh b/testing/izhikevich/04/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/04/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/04/processor_tool.txt b/testing/izhikevich/04/processor_tool.txt new file mode 100644 index 0000000..a06e37f --- /dev/null +++ b/testing/izhikevich/04/processor_tool.txt @@ -0,0 +1,12 @@ +ML tmp_network.txt + +AS 0 0 1 + +RUN 2 + +CLEAR-A + +NCH +NLF T +NC T +NT T diff --git a/testing/izhikevich/05/correct_output.txt b/testing/izhikevich/05/correct_output.txt new file mode 100644 index 0000000..8c07002 --- /dev/null +++ b/testing/izhikevich/05/correct_output.txt @@ -0,0 +1,3 @@ +node 0 last fire time: 1.0 +node 0 spike counts: 1 +node 0 spike times: 1.0 diff --git a/testing/izhikevich/05/label.txt b/testing/izhikevich/05/label.txt new file mode 100644 index 0000000..c3cfb22 --- /dev/null +++ b/testing/izhikevich/05/label.txt @@ -0,0 +1 @@ +Validating output activity bookkeeping diff --git a/testing/izhikevich/05/network_tool.txt b/testing/izhikevich/05/network_tool.txt new file mode 100644 index 0000000..184fdc3 --- /dev/null +++ b/testing/izhikevich/05/network_tool.txt @@ -0,0 +1,7 @@ +FJ tmp_empty_network.txt + +AN 0 +AI 0 +AO 0 + +TJ tmp_network.txt diff --git a/testing/izhikevich/05/processor.sh b/testing/izhikevich/05/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/05/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/05/processor_tool.txt b/testing/izhikevich/05/processor_tool.txt new file mode 100644 index 0000000..f9dd8e0 --- /dev/null +++ b/testing/izhikevich/05/processor_tool.txt @@ -0,0 +1,9 @@ +ML tmp_network.txt + +AS 0 0 1 + +RUN 2 + +OLF +OC +OT diff --git a/testing/izhikevich/06/correct_output.txt b/testing/izhikevich/06/correct_output.txt new file mode 100644 index 0000000..6aedcb3 --- /dev/null +++ b/testing/izhikevich/06/correct_output.txt @@ -0,0 +1,2 @@ +Node 0 fire times: 1.0 +Node 1 fire times: diff --git a/testing/izhikevich/06/label.txt b/testing/izhikevich/06/label.txt new file mode 100644 index 0000000..1985c42 --- /dev/null +++ b/testing/izhikevich/06/label.txt @@ -0,0 +1 @@ +Validating output tracking diff --git a/testing/izhikevich/06/network_tool.txt b/testing/izhikevich/06/network_tool.txt new file mode 100644 index 0000000..c71d001 --- /dev/null +++ b/testing/izhikevich/06/network_tool.txt @@ -0,0 +1,8 @@ +FJ tmp_empty_network.txt + +AN 0 1 + +AI 0 1 +AO 0 1 + +TJ tmp_network.txt diff --git a/testing/izhikevich/06/processor.sh b/testing/izhikevich/06/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/06/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/06/processor_tool.txt b/testing/izhikevich/06/processor_tool.txt new file mode 100644 index 0000000..6c50c78 --- /dev/null +++ b/testing/izhikevich/06/processor_tool.txt @@ -0,0 +1,10 @@ +ML tmp_network.txt + +UNTRACK_O 1 + +AS 0 0 1 +AS 1 0 1 + +RUN 2 + +NT T diff --git a/testing/izhikevich/07/correct_output.txt b/testing/izhikevich/07/correct_output.txt new file mode 100644 index 0000000..aa69636 --- /dev/null +++ b/testing/izhikevich/07/correct_output.txt @@ -0,0 +1,2 @@ + 0 -> 1 : 1.0000 + 1 -> 0 : -1.0000 diff --git a/testing/izhikevich/07/label.txt b/testing/izhikevich/07/label.txt new file mode 100644 index 0000000..44df9e0 --- /dev/null +++ b/testing/izhikevich/07/label.txt @@ -0,0 +1 @@ +Validating synapse construction diff --git a/testing/izhikevich/07/network_tool.txt b/testing/izhikevich/07/network_tool.txt new file mode 100644 index 0000000..51db0f9 --- /dev/null +++ b/testing/izhikevich/07/network_tool.txt @@ -0,0 +1,11 @@ +FJ tmp_empty_network.txt + +AN 0 1 + +SNP 0 exc 1 +SNP 1 exc 0 + +AE 0 1 +AE 1 0 + +TJ tmp_network.txt diff --git a/testing/izhikevich/07/processor.sh b/testing/izhikevich/07/processor.sh new file mode 100644 index 0000000..cdc5c03 --- /dev/null +++ b/testing/izhikevich/07/processor.sh @@ -0,0 +1,4 @@ +echo '{ + "input_scaling_value": 1, + "max_excitatory_weight": 1 +}' diff --git a/testing/izhikevich/07/processor_tool.txt b/testing/izhikevich/07/processor_tool.txt new file mode 100644 index 0000000..ac61daf --- /dev/null +++ b/testing/izhikevich/07/processor_tool.txt @@ -0,0 +1,3 @@ +ML tmp_network.txt + +SW diff --git a/testing/izhikevich/08/correct_output.txt b/testing/izhikevich/08/correct_output.txt new file mode 100644 index 0000000..76770fb --- /dev/null +++ b/testing/izhikevich/08/correct_output.txt @@ -0,0 +1,3 @@ +time: 0.0 +0 +0 diff --git a/testing/izhikevich/08/label.txt b/testing/izhikevich/08/label.txt new file mode 100644 index 0000000..e6462a6 --- /dev/null +++ b/testing/izhikevich/08/label.txt @@ -0,0 +1 @@ +Validating network construction diff --git a/testing/izhikevich/08/network_tool.txt b/testing/izhikevich/08/network_tool.txt new file mode 100644 index 0000000..dd0ae93 --- /dev/null +++ b/testing/izhikevich/08/network_tool.txt @@ -0,0 +1,3 @@ +FJ tmp_empty_network.txt + +TJ tmp_network.txt diff --git a/testing/izhikevich/08/processor.sh b/testing/izhikevich/08/processor.sh new file mode 100644 index 0000000..dc2144b --- /dev/null +++ b/testing/izhikevich/08/processor.sh @@ -0,0 +1,2 @@ +echo '{ +}' diff --git a/testing/izhikevich/08/processor_tool.txt b/testing/izhikevich/08/processor_tool.txt new file mode 100644 index 0000000..8529703 --- /dev/null +++ b/testing/izhikevich/08/processor_tool.txt @@ -0,0 +1,5 @@ +ML tmp_network.txt + +GT +TNC +TNA diff --git a/testing/izhikevich/09/correct_output.txt b/testing/izhikevich/09/correct_output.txt new file mode 100644 index 0000000..b2aa395 --- /dev/null +++ b/testing/izhikevich/09/correct_output.txt @@ -0,0 +1,3 @@ +time: 2.0 +1 +1 diff --git a/testing/izhikevich/09/label.txt b/testing/izhikevich/09/label.txt new file mode 100644 index 0000000..2819fdd --- /dev/null +++ b/testing/izhikevich/09/label.txt @@ -0,0 +1 @@ +Validating network activity bookkeeping diff --git a/testing/izhikevich/09/network_tool.txt b/testing/izhikevich/09/network_tool.txt new file mode 100644 index 0000000..b895998 --- /dev/null +++ b/testing/izhikevich/09/network_tool.txt @@ -0,0 +1,11 @@ +FJ tmp_empty_network.txt + +AN 0 1 + +AI 0 + +AE 0 1 + +SEP 0 1 excitatory_weight 1 + +TJ tmp_network.txt diff --git a/testing/izhikevich/09/processor.sh b/testing/izhikevich/09/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/09/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/09/processor_tool.txt b/testing/izhikevich/09/processor_tool.txt new file mode 100644 index 0000000..451d414 --- /dev/null +++ b/testing/izhikevich/09/processor_tool.txt @@ -0,0 +1,9 @@ +ML tmp_network.txt + +AS 0 0 1 + +RUN 2 + +GT +TNC +TNA diff --git a/testing/izhikevich/10/correct_output.txt b/testing/izhikevich/10/correct_output.txt new file mode 100644 index 0000000..76770fb --- /dev/null +++ b/testing/izhikevich/10/correct_output.txt @@ -0,0 +1,3 @@ +time: 0.0 +0 +0 diff --git a/testing/izhikevich/10/label.txt b/testing/izhikevich/10/label.txt new file mode 100644 index 0000000..de27ee4 --- /dev/null +++ b/testing/izhikevich/10/label.txt @@ -0,0 +1 @@ +Validating network reset diff --git a/testing/izhikevich/10/network_tool.txt b/testing/izhikevich/10/network_tool.txt new file mode 100644 index 0000000..24c7791 --- /dev/null +++ b/testing/izhikevich/10/network_tool.txt @@ -0,0 +1,11 @@ +FJ tmp_empty_network.txt + +AN 0 1 + +AI 0 + +AE 0 1 + +SEP 0 1 excitatory_weight 1 + +TJ tmp_network.txt diff --git a/testing/izhikevich/10/processor.sh b/testing/izhikevich/10/processor.sh new file mode 100644 index 0000000..143b5f0 --- /dev/null +++ b/testing/izhikevich/10/processor.sh @@ -0,0 +1,3 @@ +echo '{ + "input_scaling_value": 100 +}' diff --git a/testing/izhikevich/10/processor_tool.txt b/testing/izhikevich/10/processor_tool.txt new file mode 100644 index 0000000..ba77cb0 --- /dev/null +++ b/testing/izhikevich/10/processor_tool.txt @@ -0,0 +1,11 @@ +ML tmp_network.txt + +AS 0 0 1 + +RUN 2 + +CLEAR-A + +GT +TNC +TNA diff --git a/testing/izhikevich/11/correct_output.txt b/testing/izhikevich/11/correct_output.txt new file mode 100644 index 0000000..b766c15 --- /dev/null +++ b/testing/izhikevich/11/correct_output.txt @@ -0,0 +1,20 @@ +{ + "input_scaling_value": 7, + "max_excitatory_delay": 4, + "max_excitatory_weight": 2, + "max_inhibitory_delay": 6, + "max_inhibitory_weight": -1, + "min_excitatory_delay": 3, + "min_excitatory_weight": 1, + "min_inhibitory_delay": 5, + "min_inhibitory_weight": -2 +} +{ "node_properties": [ + { "name":"exc", "type":66, "index":0, "size":1, "min_value":0.0, "max_value":1.0 }], + "edge_properties": [ + { "name":"excitatory_delay", "type":73, "index":2, "size":1, "min_value":3.0, "max_value":4.0 }, + { "name":"excitatory_weight", "type":73, "index":0, "size":1, "min_value":1.0, "max_value":2.0 }, + { "name":"inhibitory_delay", "type":73, "index":3, "size":1, "min_value":5.0, "max_value":6.0 }, + { "name":"inhibitory_weight", "type":73, "index":1, "size":1, "min_value":-2.0, "max_value":-1.0 }], + "network_properties": [] } +{"binary_input":false,"input_scaling_value":7,"integration_delay":true,"plasticity":"none","run_time_inclusive":false,"spike_raster_info":true,"threshold_inclusive":true} diff --git a/testing/izhikevich/11/label.txt b/testing/izhikevich/11/label.txt new file mode 100644 index 0000000..3a1b6f2 --- /dev/null +++ b/testing/izhikevich/11/label.txt @@ -0,0 +1 @@ +Validating processor construction diff --git a/testing/izhikevich/11/network_tool.txt b/testing/izhikevich/11/network_tool.txt new file mode 100644 index 0000000..dd0ae93 --- /dev/null +++ b/testing/izhikevich/11/network_tool.txt @@ -0,0 +1,3 @@ +FJ tmp_empty_network.txt + +TJ tmp_network.txt diff --git a/testing/izhikevich/11/processor.sh b/testing/izhikevich/11/processor.sh new file mode 100644 index 0000000..b004e2e --- /dev/null +++ b/testing/izhikevich/11/processor.sh @@ -0,0 +1,13 @@ +echo '{ + "min_excitatory_weight": 1, + "max_excitatory_weight": 2, + "min_inhibitory_weight": -2, + "max_inhibitory_weight": -1, + + "min_excitatory_delay": 3, + "max_excitatory_delay": 4, + "min_inhibitory_delay": 5, + "max_inhibitory_delay": 6, + + "input_scaling_value": 7 +}' diff --git a/testing/izhikevich/11/processor_tool.txt b/testing/izhikevich/11/processor_tool.txt new file mode 100644 index 0000000..9ce9f23 --- /dev/null +++ b/testing/izhikevich/11/processor_tool.txt @@ -0,0 +1,5 @@ +ML tmp_network.txt + +PARAMS +PPACK +PP diff --git a/testing/01/correct_output.txt b/testing/risp/01/correct_output.txt similarity index 100% rename from testing/01/correct_output.txt rename to testing/risp/01/correct_output.txt diff --git a/testing/01/label.txt b/testing/risp/01/label.txt similarity index 100% rename from testing/01/label.txt rename to testing/risp/01/label.txt diff --git a/testing/01/network_tool.txt b/testing/risp/01/network_tool.txt similarity index 100% rename from testing/01/network_tool.txt rename to testing/risp/01/network_tool.txt diff --git a/testing/01/processor.sh b/testing/risp/01/processor.sh similarity index 100% rename from testing/01/processor.sh rename to testing/risp/01/processor.sh diff --git a/testing/01/processor_tool.txt b/testing/risp/01/processor_tool.txt similarity index 100% rename from testing/01/processor_tool.txt rename to testing/risp/01/processor_tool.txt diff --git a/testing/02/correct_output.txt b/testing/risp/02/correct_output.txt similarity index 100% rename from testing/02/correct_output.txt rename to testing/risp/02/correct_output.txt diff --git a/testing/02/label.txt b/testing/risp/02/label.txt similarity index 100% rename from testing/02/label.txt rename to testing/risp/02/label.txt diff --git a/testing/02/network_tool.txt b/testing/risp/02/network_tool.txt similarity index 100% rename from testing/02/network_tool.txt rename to testing/risp/02/network_tool.txt diff --git a/testing/02/processor.sh b/testing/risp/02/processor.sh similarity index 100% rename from testing/02/processor.sh rename to testing/risp/02/processor.sh diff --git a/testing/02/processor_tool.txt b/testing/risp/02/processor_tool.txt similarity index 100% rename from testing/02/processor_tool.txt rename to testing/risp/02/processor_tool.txt diff --git a/testing/03/correct_output.txt b/testing/risp/03/correct_output.txt similarity index 100% rename from testing/03/correct_output.txt rename to testing/risp/03/correct_output.txt diff --git a/testing/03/label.txt b/testing/risp/03/label.txt similarity index 100% rename from testing/03/label.txt rename to testing/risp/03/label.txt diff --git a/testing/03/network_tool.txt b/testing/risp/03/network_tool.txt similarity index 100% rename from testing/03/network_tool.txt rename to testing/risp/03/network_tool.txt diff --git a/testing/03/processor.sh b/testing/risp/03/processor.sh similarity index 100% rename from testing/03/processor.sh rename to testing/risp/03/processor.sh diff --git a/testing/03/processor_tool.txt b/testing/risp/03/processor_tool.txt similarity index 100% rename from testing/03/processor_tool.txt rename to testing/risp/03/processor_tool.txt diff --git a/testing/04/correct_output.txt b/testing/risp/04/correct_output.txt similarity index 100% rename from testing/04/correct_output.txt rename to testing/risp/04/correct_output.txt diff --git a/testing/04/label.txt b/testing/risp/04/label.txt similarity index 100% rename from testing/04/label.txt rename to testing/risp/04/label.txt diff --git a/testing/04/network_tool.txt b/testing/risp/04/network_tool.txt similarity index 100% rename from testing/04/network_tool.txt rename to testing/risp/04/network_tool.txt diff --git a/testing/04/processor.sh b/testing/risp/04/processor.sh similarity index 100% rename from testing/04/processor.sh rename to testing/risp/04/processor.sh diff --git a/testing/04/processor_tool.txt b/testing/risp/04/processor_tool.txt similarity index 100% rename from testing/04/processor_tool.txt rename to testing/risp/04/processor_tool.txt diff --git a/testing/05/correct_output.txt b/testing/risp/05/correct_output.txt similarity index 100% rename from testing/05/correct_output.txt rename to testing/risp/05/correct_output.txt diff --git a/testing/05/label.txt b/testing/risp/05/label.txt similarity index 100% rename from testing/05/label.txt rename to testing/risp/05/label.txt diff --git a/testing/05/network_tool.txt b/testing/risp/05/network_tool.txt similarity index 100% rename from testing/05/network_tool.txt rename to testing/risp/05/network_tool.txt diff --git a/testing/05/processor.sh b/testing/risp/05/processor.sh similarity index 100% rename from testing/05/processor.sh rename to testing/risp/05/processor.sh diff --git a/testing/05/processor_tool.txt b/testing/risp/05/processor_tool.txt similarity index 100% rename from testing/05/processor_tool.txt rename to testing/risp/05/processor_tool.txt diff --git a/testing/06/correct_output.txt b/testing/risp/06/correct_output.txt similarity index 100% rename from testing/06/correct_output.txt rename to testing/risp/06/correct_output.txt diff --git a/testing/06/label.txt b/testing/risp/06/label.txt similarity index 100% rename from testing/06/label.txt rename to testing/risp/06/label.txt diff --git a/testing/06/network_tool.txt b/testing/risp/06/network_tool.txt similarity index 100% rename from testing/06/network_tool.txt rename to testing/risp/06/network_tool.txt diff --git a/testing/06/processor.sh b/testing/risp/06/processor.sh similarity index 100% rename from testing/06/processor.sh rename to testing/risp/06/processor.sh diff --git a/testing/06/processor_tool.txt b/testing/risp/06/processor_tool.txt similarity index 100% rename from testing/06/processor_tool.txt rename to testing/risp/06/processor_tool.txt diff --git a/testing/07/correct_output.txt b/testing/risp/07/correct_output.txt similarity index 100% rename from testing/07/correct_output.txt rename to testing/risp/07/correct_output.txt diff --git a/testing/07/label.txt b/testing/risp/07/label.txt similarity index 100% rename from testing/07/label.txt rename to testing/risp/07/label.txt diff --git a/testing/07/network_tool.txt b/testing/risp/07/network_tool.txt similarity index 100% rename from testing/07/network_tool.txt rename to testing/risp/07/network_tool.txt diff --git a/testing/07/processor.sh b/testing/risp/07/processor.sh similarity index 100% rename from testing/07/processor.sh rename to testing/risp/07/processor.sh diff --git a/testing/07/processor_tool.txt b/testing/risp/07/processor_tool.txt similarity index 100% rename from testing/07/processor_tool.txt rename to testing/risp/07/processor_tool.txt diff --git a/testing/08/correct_output.txt b/testing/risp/08/correct_output.txt similarity index 100% rename from testing/08/correct_output.txt rename to testing/risp/08/correct_output.txt diff --git a/testing/08/label.txt b/testing/risp/08/label.txt similarity index 100% rename from testing/08/label.txt rename to testing/risp/08/label.txt diff --git a/testing/08/network_tool.txt b/testing/risp/08/network_tool.txt similarity index 100% rename from testing/08/network_tool.txt rename to testing/risp/08/network_tool.txt diff --git a/testing/08/processor.sh b/testing/risp/08/processor.sh similarity index 100% rename from testing/08/processor.sh rename to testing/risp/08/processor.sh diff --git a/testing/08/processor_tool.txt b/testing/risp/08/processor_tool.txt similarity index 100% rename from testing/08/processor_tool.txt rename to testing/risp/08/processor_tool.txt diff --git a/testing/09/correct_output.txt b/testing/risp/09/correct_output.txt similarity index 100% rename from testing/09/correct_output.txt rename to testing/risp/09/correct_output.txt diff --git a/testing/09/label.txt b/testing/risp/09/label.txt similarity index 100% rename from testing/09/label.txt rename to testing/risp/09/label.txt diff --git a/testing/09/network_tool.txt b/testing/risp/09/network_tool.txt similarity index 100% rename from testing/09/network_tool.txt rename to testing/risp/09/network_tool.txt diff --git a/testing/09/processor.sh b/testing/risp/09/processor.sh similarity index 100% rename from testing/09/processor.sh rename to testing/risp/09/processor.sh diff --git a/testing/09/processor_tool.txt b/testing/risp/09/processor_tool.txt similarity index 100% rename from testing/09/processor_tool.txt rename to testing/risp/09/processor_tool.txt diff --git a/testing/10/correct_output.txt b/testing/risp/10/correct_output.txt similarity index 100% rename from testing/10/correct_output.txt rename to testing/risp/10/correct_output.txt diff --git a/testing/10/label.txt b/testing/risp/10/label.txt similarity index 100% rename from testing/10/label.txt rename to testing/risp/10/label.txt diff --git a/testing/10/network_tool.txt b/testing/risp/10/network_tool.txt similarity index 100% rename from testing/10/network_tool.txt rename to testing/risp/10/network_tool.txt diff --git a/testing/10/processor.sh b/testing/risp/10/processor.sh similarity index 100% rename from testing/10/processor.sh rename to testing/risp/10/processor.sh diff --git a/testing/10/processor_tool.txt b/testing/risp/10/processor_tool.txt similarity index 100% rename from testing/10/processor_tool.txt rename to testing/risp/10/processor_tool.txt diff --git a/testing/11/correct_output.txt b/testing/risp/11/correct_output.txt similarity index 100% rename from testing/11/correct_output.txt rename to testing/risp/11/correct_output.txt diff --git a/testing/11/label.txt b/testing/risp/11/label.txt similarity index 100% rename from testing/11/label.txt rename to testing/risp/11/label.txt diff --git a/testing/11/network_tool.txt b/testing/risp/11/network_tool.txt similarity index 100% rename from testing/11/network_tool.txt rename to testing/risp/11/network_tool.txt diff --git a/testing/11/processor.sh b/testing/risp/11/processor.sh similarity index 100% rename from testing/11/processor.sh rename to testing/risp/11/processor.sh diff --git a/testing/11/processor_tool.txt b/testing/risp/11/processor_tool.txt similarity index 100% rename from testing/11/processor_tool.txt rename to testing/risp/11/processor_tool.txt diff --git a/testing/12/correct_output.txt b/testing/risp/12/correct_output.txt similarity index 100% rename from testing/12/correct_output.txt rename to testing/risp/12/correct_output.txt diff --git a/testing/12/label.txt b/testing/risp/12/label.txt similarity index 100% rename from testing/12/label.txt rename to testing/risp/12/label.txt diff --git a/testing/12/network_tool.txt b/testing/risp/12/network_tool.txt similarity index 100% rename from testing/12/network_tool.txt rename to testing/risp/12/network_tool.txt diff --git a/testing/12/processor.sh b/testing/risp/12/processor.sh similarity index 100% rename from testing/12/processor.sh rename to testing/risp/12/processor.sh diff --git a/testing/12/processor_tool.txt b/testing/risp/12/processor_tool.txt similarity index 100% rename from testing/12/processor_tool.txt rename to testing/risp/12/processor_tool.txt diff --git a/testing/13/correct_output.txt b/testing/risp/13/correct_output.txt similarity index 100% rename from testing/13/correct_output.txt rename to testing/risp/13/correct_output.txt diff --git a/testing/13/label.txt b/testing/risp/13/label.txt similarity index 100% rename from testing/13/label.txt rename to testing/risp/13/label.txt diff --git a/testing/13/network_tool.txt b/testing/risp/13/network_tool.txt similarity index 100% rename from testing/13/network_tool.txt rename to testing/risp/13/network_tool.txt diff --git a/testing/13/processor.sh b/testing/risp/13/processor.sh similarity index 100% rename from testing/13/processor.sh rename to testing/risp/13/processor.sh diff --git a/testing/13/processor_tool.txt b/testing/risp/13/processor_tool.txt similarity index 100% rename from testing/13/processor_tool.txt rename to testing/risp/13/processor_tool.txt diff --git a/testing/14/correct_output.txt b/testing/risp/14/correct_output.txt similarity index 100% rename from testing/14/correct_output.txt rename to testing/risp/14/correct_output.txt diff --git a/testing/14/label.txt b/testing/risp/14/label.txt similarity index 100% rename from testing/14/label.txt rename to testing/risp/14/label.txt diff --git a/testing/14/network_tool.txt b/testing/risp/14/network_tool.txt similarity index 100% rename from testing/14/network_tool.txt rename to testing/risp/14/network_tool.txt diff --git a/testing/14/processor.sh b/testing/risp/14/processor.sh similarity index 100% rename from testing/14/processor.sh rename to testing/risp/14/processor.sh diff --git a/testing/14/processor_tool.txt b/testing/risp/14/processor_tool.txt similarity index 100% rename from testing/14/processor_tool.txt rename to testing/risp/14/processor_tool.txt diff --git a/testing/15/correct_output.txt b/testing/risp/15/correct_output.txt similarity index 100% rename from testing/15/correct_output.txt rename to testing/risp/15/correct_output.txt diff --git a/testing/15/label.txt b/testing/risp/15/label.txt similarity index 100% rename from testing/15/label.txt rename to testing/risp/15/label.txt diff --git a/testing/15/network_tool.txt b/testing/risp/15/network_tool.txt similarity index 100% rename from testing/15/network_tool.txt rename to testing/risp/15/network_tool.txt diff --git a/testing/15/processor.sh b/testing/risp/15/processor.sh similarity index 100% rename from testing/15/processor.sh rename to testing/risp/15/processor.sh diff --git a/testing/15/processor_tool.txt b/testing/risp/15/processor_tool.txt similarity index 100% rename from testing/15/processor_tool.txt rename to testing/risp/15/processor_tool.txt diff --git a/testing/16/correct_output.txt b/testing/risp/16/correct_output.txt similarity index 100% rename from testing/16/correct_output.txt rename to testing/risp/16/correct_output.txt diff --git a/testing/16/label.txt b/testing/risp/16/label.txt similarity index 100% rename from testing/16/label.txt rename to testing/risp/16/label.txt diff --git a/testing/16/network_tool.txt b/testing/risp/16/network_tool.txt similarity index 100% rename from testing/16/network_tool.txt rename to testing/risp/16/network_tool.txt diff --git a/testing/16/processor.sh b/testing/risp/16/processor.sh similarity index 100% rename from testing/16/processor.sh rename to testing/risp/16/processor.sh diff --git a/testing/16/processor_tool.txt b/testing/risp/16/processor_tool.txt similarity index 100% rename from testing/16/processor_tool.txt rename to testing/risp/16/processor_tool.txt diff --git a/testing/17/correct_output.txt b/testing/risp/17/correct_output.txt similarity index 100% rename from testing/17/correct_output.txt rename to testing/risp/17/correct_output.txt diff --git a/testing/17/label.txt b/testing/risp/17/label.txt similarity index 100% rename from testing/17/label.txt rename to testing/risp/17/label.txt diff --git a/testing/17/network_tool.txt b/testing/risp/17/network_tool.txt similarity index 100% rename from testing/17/network_tool.txt rename to testing/risp/17/network_tool.txt diff --git a/testing/17/processor.sh b/testing/risp/17/processor.sh similarity index 100% rename from testing/17/processor.sh rename to testing/risp/17/processor.sh diff --git a/testing/17/processor_tool.txt b/testing/risp/17/processor_tool.txt similarity index 100% rename from testing/17/processor_tool.txt rename to testing/risp/17/processor_tool.txt diff --git a/testing/18/correct_output.txt b/testing/risp/18/correct_output.txt similarity index 100% rename from testing/18/correct_output.txt rename to testing/risp/18/correct_output.txt diff --git a/testing/18/label.txt b/testing/risp/18/label.txt similarity index 100% rename from testing/18/label.txt rename to testing/risp/18/label.txt diff --git a/testing/18/network_tool.txt b/testing/risp/18/network_tool.txt similarity index 100% rename from testing/18/network_tool.txt rename to testing/risp/18/network_tool.txt diff --git a/testing/18/processor.sh b/testing/risp/18/processor.sh similarity index 100% rename from testing/18/processor.sh rename to testing/risp/18/processor.sh diff --git a/testing/18/processor_tool.txt b/testing/risp/18/processor_tool.txt similarity index 100% rename from testing/18/processor_tool.txt rename to testing/risp/18/processor_tool.txt diff --git a/testing/19/correct_output.txt b/testing/risp/19/correct_output.txt similarity index 100% rename from testing/19/correct_output.txt rename to testing/risp/19/correct_output.txt diff --git a/testing/19/label.txt b/testing/risp/19/label.txt similarity index 100% rename from testing/19/label.txt rename to testing/risp/19/label.txt diff --git a/testing/19/network_tool.txt b/testing/risp/19/network_tool.txt similarity index 100% rename from testing/19/network_tool.txt rename to testing/risp/19/network_tool.txt diff --git a/testing/19/processor.sh b/testing/risp/19/processor.sh similarity index 100% rename from testing/19/processor.sh rename to testing/risp/19/processor.sh diff --git a/testing/19/processor_tool.txt b/testing/risp/19/processor_tool.txt similarity index 100% rename from testing/19/processor_tool.txt rename to testing/risp/19/processor_tool.txt diff --git a/testing/20/correct_output.txt b/testing/risp/20/correct_output.txt similarity index 100% rename from testing/20/correct_output.txt rename to testing/risp/20/correct_output.txt diff --git a/testing/20/label.txt b/testing/risp/20/label.txt similarity index 100% rename from testing/20/label.txt rename to testing/risp/20/label.txt diff --git a/testing/20/network_tool.txt b/testing/risp/20/network_tool.txt similarity index 100% rename from testing/20/network_tool.txt rename to testing/risp/20/network_tool.txt diff --git a/testing/20/processor.sh b/testing/risp/20/processor.sh similarity index 100% rename from testing/20/processor.sh rename to testing/risp/20/processor.sh diff --git a/testing/20/processor_tool.txt b/testing/risp/20/processor_tool.txt similarity index 100% rename from testing/20/processor_tool.txt rename to testing/risp/20/processor_tool.txt diff --git a/testing/21/correct_output.txt b/testing/risp/21/correct_output.txt similarity index 100% rename from testing/21/correct_output.txt rename to testing/risp/21/correct_output.txt diff --git a/testing/21/label.txt b/testing/risp/21/label.txt similarity index 100% rename from testing/21/label.txt rename to testing/risp/21/label.txt diff --git a/testing/21/network_tool.txt b/testing/risp/21/network_tool.txt similarity index 100% rename from testing/21/network_tool.txt rename to testing/risp/21/network_tool.txt diff --git a/testing/21/processor.sh b/testing/risp/21/processor.sh similarity index 100% rename from testing/21/processor.sh rename to testing/risp/21/processor.sh diff --git a/testing/21/processor_tool.txt b/testing/risp/21/processor_tool.txt similarity index 100% rename from testing/21/processor_tool.txt rename to testing/risp/21/processor_tool.txt diff --git a/testing/22/correct_output.txt b/testing/risp/22/correct_output.txt similarity index 100% rename from testing/22/correct_output.txt rename to testing/risp/22/correct_output.txt diff --git a/testing/22/label.txt b/testing/risp/22/label.txt similarity index 100% rename from testing/22/label.txt rename to testing/risp/22/label.txt diff --git a/testing/22/network_tool.txt b/testing/risp/22/network_tool.txt similarity index 100% rename from testing/22/network_tool.txt rename to testing/risp/22/network_tool.txt diff --git a/testing/22/processor.sh b/testing/risp/22/processor.sh similarity index 100% rename from testing/22/processor.sh rename to testing/risp/22/processor.sh diff --git a/testing/22/processor_tool.txt b/testing/risp/22/processor_tool.txt similarity index 100% rename from testing/22/processor_tool.txt rename to testing/risp/22/processor_tool.txt diff --git a/testing/23/correct_output.txt b/testing/risp/23/correct_output.txt similarity index 100% rename from testing/23/correct_output.txt rename to testing/risp/23/correct_output.txt diff --git a/testing/23/label.txt b/testing/risp/23/label.txt similarity index 100% rename from testing/23/label.txt rename to testing/risp/23/label.txt diff --git a/testing/23/network_tool.txt b/testing/risp/23/network_tool.txt similarity index 100% rename from testing/23/network_tool.txt rename to testing/risp/23/network_tool.txt diff --git a/testing/23/processor.sh b/testing/risp/23/processor.sh similarity index 100% rename from testing/23/processor.sh rename to testing/risp/23/processor.sh diff --git a/testing/23/processor_tool.txt b/testing/risp/23/processor_tool.txt similarity index 100% rename from testing/23/processor_tool.txt rename to testing/risp/23/processor_tool.txt diff --git a/testing/24/correct_output.txt b/testing/risp/24/correct_output.txt similarity index 100% rename from testing/24/correct_output.txt rename to testing/risp/24/correct_output.txt diff --git a/testing/24/label.txt b/testing/risp/24/label.txt similarity index 100% rename from testing/24/label.txt rename to testing/risp/24/label.txt diff --git a/testing/24/network_tool.txt b/testing/risp/24/network_tool.txt similarity index 100% rename from testing/24/network_tool.txt rename to testing/risp/24/network_tool.txt diff --git a/testing/24/processor.sh b/testing/risp/24/processor.sh similarity index 100% rename from testing/24/processor.sh rename to testing/risp/24/processor.sh diff --git a/testing/24/processor_tool.txt b/testing/risp/24/processor_tool.txt similarity index 100% rename from testing/24/processor_tool.txt rename to testing/risp/24/processor_tool.txt diff --git a/testing/25/correct_output.txt b/testing/risp/25/correct_output.txt similarity index 100% rename from testing/25/correct_output.txt rename to testing/risp/25/correct_output.txt diff --git a/testing/25/label.txt b/testing/risp/25/label.txt similarity index 100% rename from testing/25/label.txt rename to testing/risp/25/label.txt diff --git a/testing/25/network_tool.txt b/testing/risp/25/network_tool.txt similarity index 100% rename from testing/25/network_tool.txt rename to testing/risp/25/network_tool.txt diff --git a/testing/25/processor.sh b/testing/risp/25/processor.sh similarity index 100% rename from testing/25/processor.sh rename to testing/risp/25/processor.sh diff --git a/testing/25/processor_tool.txt b/testing/risp/25/processor_tool.txt similarity index 100% rename from testing/25/processor_tool.txt rename to testing/risp/25/processor_tool.txt diff --git a/testing/26/correct_output.txt b/testing/risp/26/correct_output.txt similarity index 100% rename from testing/26/correct_output.txt rename to testing/risp/26/correct_output.txt diff --git a/testing/26/label.txt b/testing/risp/26/label.txt similarity index 100% rename from testing/26/label.txt rename to testing/risp/26/label.txt diff --git a/testing/26/network_tool.txt b/testing/risp/26/network_tool.txt similarity index 100% rename from testing/26/network_tool.txt rename to testing/risp/26/network_tool.txt diff --git a/testing/26/processor.sh b/testing/risp/26/processor.sh similarity index 100% rename from testing/26/processor.sh rename to testing/risp/26/processor.sh diff --git a/testing/26/processor_tool.txt b/testing/risp/26/processor_tool.txt similarity index 100% rename from testing/26/processor_tool.txt rename to testing/risp/26/processor_tool.txt diff --git a/testing/27/correct_output.txt b/testing/risp/27/correct_output.txt similarity index 100% rename from testing/27/correct_output.txt rename to testing/risp/27/correct_output.txt diff --git a/testing/27/label.txt b/testing/risp/27/label.txt similarity index 100% rename from testing/27/label.txt rename to testing/risp/27/label.txt diff --git a/testing/27/network_tool.txt b/testing/risp/27/network_tool.txt similarity index 100% rename from testing/27/network_tool.txt rename to testing/risp/27/network_tool.txt diff --git a/testing/27/processor.sh b/testing/risp/27/processor.sh similarity index 100% rename from testing/27/processor.sh rename to testing/risp/27/processor.sh diff --git a/testing/27/processor_tool.txt b/testing/risp/27/processor_tool.txt similarity index 100% rename from testing/27/processor_tool.txt rename to testing/risp/27/processor_tool.txt diff --git a/testing/28/correct_output.txt b/testing/risp/28/correct_output.txt similarity index 100% rename from testing/28/correct_output.txt rename to testing/risp/28/correct_output.txt diff --git a/testing/28/label.txt b/testing/risp/28/label.txt similarity index 100% rename from testing/28/label.txt rename to testing/risp/28/label.txt diff --git a/testing/28/network_tool.txt b/testing/risp/28/network_tool.txt similarity index 100% rename from testing/28/network_tool.txt rename to testing/risp/28/network_tool.txt diff --git a/testing/28/processor.sh b/testing/risp/28/processor.sh similarity index 100% rename from testing/28/processor.sh rename to testing/risp/28/processor.sh diff --git a/testing/28/processor_tool.txt b/testing/risp/28/processor_tool.txt similarity index 100% rename from testing/28/processor_tool.txt rename to testing/risp/28/processor_tool.txt diff --git a/testing/29/correct_output.txt b/testing/risp/29/correct_output.txt similarity index 100% rename from testing/29/correct_output.txt rename to testing/risp/29/correct_output.txt diff --git a/testing/29/label.txt b/testing/risp/29/label.txt similarity index 100% rename from testing/29/label.txt rename to testing/risp/29/label.txt diff --git a/testing/29/network_tool.txt b/testing/risp/29/network_tool.txt similarity index 100% rename from testing/29/network_tool.txt rename to testing/risp/29/network_tool.txt diff --git a/testing/29/processor.sh b/testing/risp/29/processor.sh similarity index 100% rename from testing/29/processor.sh rename to testing/risp/29/processor.sh diff --git a/testing/29/processor_tool.txt b/testing/risp/29/processor_tool.txt similarity index 100% rename from testing/29/processor_tool.txt rename to testing/risp/29/processor_tool.txt diff --git a/testing/30/correct_output.txt b/testing/risp/30/correct_output.txt similarity index 100% rename from testing/30/correct_output.txt rename to testing/risp/30/correct_output.txt diff --git a/testing/30/label.txt b/testing/risp/30/label.txt similarity index 100% rename from testing/30/label.txt rename to testing/risp/30/label.txt diff --git a/testing/30/network_tool.txt b/testing/risp/30/network_tool.txt similarity index 100% rename from testing/30/network_tool.txt rename to testing/risp/30/network_tool.txt diff --git a/testing/30/processor.sh b/testing/risp/30/processor.sh similarity index 100% rename from testing/30/processor.sh rename to testing/risp/30/processor.sh diff --git a/testing/30/processor_tool.txt b/testing/risp/30/processor_tool.txt similarity index 100% rename from testing/30/processor_tool.txt rename to testing/risp/30/processor_tool.txt diff --git a/testing/31/correct_output.txt b/testing/risp/31/correct_output.txt similarity index 100% rename from testing/31/correct_output.txt rename to testing/risp/31/correct_output.txt diff --git a/testing/31/label.txt b/testing/risp/31/label.txt similarity index 100% rename from testing/31/label.txt rename to testing/risp/31/label.txt diff --git a/testing/31/network_tool.txt b/testing/risp/31/network_tool.txt similarity index 100% rename from testing/31/network_tool.txt rename to testing/risp/31/network_tool.txt diff --git a/testing/31/processor.sh b/testing/risp/31/processor.sh similarity index 100% rename from testing/31/processor.sh rename to testing/risp/31/processor.sh diff --git a/testing/31/processor_tool.txt b/testing/risp/31/processor_tool.txt similarity index 100% rename from testing/31/processor_tool.txt rename to testing/risp/31/processor_tool.txt diff --git a/testing/32/correct_output.txt b/testing/risp/32/correct_output.txt similarity index 100% rename from testing/32/correct_output.txt rename to testing/risp/32/correct_output.txt diff --git a/testing/32/label.txt b/testing/risp/32/label.txt similarity index 100% rename from testing/32/label.txt rename to testing/risp/32/label.txt diff --git a/testing/32/network_tool.txt b/testing/risp/32/network_tool.txt similarity index 100% rename from testing/32/network_tool.txt rename to testing/risp/32/network_tool.txt diff --git a/testing/32/processor.sh b/testing/risp/32/processor.sh similarity index 100% rename from testing/32/processor.sh rename to testing/risp/32/processor.sh diff --git a/testing/32/processor_tool.txt b/testing/risp/32/processor_tool.txt similarity index 100% rename from testing/32/processor_tool.txt rename to testing/risp/32/processor_tool.txt diff --git a/testing/33/correct_output.txt b/testing/risp/33/correct_output.txt similarity index 100% rename from testing/33/correct_output.txt rename to testing/risp/33/correct_output.txt diff --git a/testing/33/label.txt b/testing/risp/33/label.txt similarity index 100% rename from testing/33/label.txt rename to testing/risp/33/label.txt diff --git a/testing/33/network_tool.txt b/testing/risp/33/network_tool.txt similarity index 100% rename from testing/33/network_tool.txt rename to testing/risp/33/network_tool.txt diff --git a/testing/33/processor.sh b/testing/risp/33/processor.sh similarity index 100% rename from testing/33/processor.sh rename to testing/risp/33/processor.sh diff --git a/testing/33/processor_tool.txt b/testing/risp/33/processor_tool.txt similarity index 100% rename from testing/33/processor_tool.txt rename to testing/risp/33/processor_tool.txt diff --git a/testing/34/correct_output.txt b/testing/risp/34/correct_output.txt similarity index 100% rename from testing/34/correct_output.txt rename to testing/risp/34/correct_output.txt diff --git a/testing/34/label.txt b/testing/risp/34/label.txt similarity index 100% rename from testing/34/label.txt rename to testing/risp/34/label.txt diff --git a/testing/34/network_tool.txt b/testing/risp/34/network_tool.txt similarity index 100% rename from testing/34/network_tool.txt rename to testing/risp/34/network_tool.txt diff --git a/testing/34/processor.sh b/testing/risp/34/processor.sh similarity index 100% rename from testing/34/processor.sh rename to testing/risp/34/processor.sh diff --git a/testing/34/processor_tool.txt b/testing/risp/34/processor_tool.txt similarity index 100% rename from testing/34/processor_tool.txt rename to testing/risp/34/processor_tool.txt diff --git a/testing/35/correct_output.txt b/testing/risp/35/correct_output.txt similarity index 100% rename from testing/35/correct_output.txt rename to testing/risp/35/correct_output.txt diff --git a/testing/35/label.txt b/testing/risp/35/label.txt similarity index 100% rename from testing/35/label.txt rename to testing/risp/35/label.txt diff --git a/testing/35/network_tool.txt b/testing/risp/35/network_tool.txt similarity index 100% rename from testing/35/network_tool.txt rename to testing/risp/35/network_tool.txt diff --git a/testing/35/processor.sh b/testing/risp/35/processor.sh similarity index 100% rename from testing/35/processor.sh rename to testing/risp/35/processor.sh diff --git a/testing/35/processor_tool.txt b/testing/risp/35/processor_tool.txt similarity index 100% rename from testing/35/processor_tool.txt rename to testing/risp/35/processor_tool.txt diff --git a/testing/36/correct_output.txt b/testing/risp/36/correct_output.txt similarity index 100% rename from testing/36/correct_output.txt rename to testing/risp/36/correct_output.txt diff --git a/testing/36/label.txt b/testing/risp/36/label.txt similarity index 100% rename from testing/36/label.txt rename to testing/risp/36/label.txt diff --git a/testing/36/network_tool.txt b/testing/risp/36/network_tool.txt similarity index 100% rename from testing/36/network_tool.txt rename to testing/risp/36/network_tool.txt diff --git a/testing/36/processor.sh b/testing/risp/36/processor.sh similarity index 100% rename from testing/36/processor.sh rename to testing/risp/36/processor.sh diff --git a/testing/36/processor_tool.txt b/testing/risp/36/processor_tool.txt similarity index 100% rename from testing/36/processor_tool.txt rename to testing/risp/36/processor_tool.txt diff --git a/testing/37/correct_output.txt b/testing/risp/37/correct_output.txt similarity index 100% rename from testing/37/correct_output.txt rename to testing/risp/37/correct_output.txt diff --git a/testing/37/label.txt b/testing/risp/37/label.txt similarity index 100% rename from testing/37/label.txt rename to testing/risp/37/label.txt diff --git a/testing/37/network_tool.txt b/testing/risp/37/network_tool.txt similarity index 100% rename from testing/37/network_tool.txt rename to testing/risp/37/network_tool.txt diff --git a/testing/37/processor.sh b/testing/risp/37/processor.sh similarity index 100% rename from testing/37/processor.sh rename to testing/risp/37/processor.sh diff --git a/testing/37/processor_tool.txt b/testing/risp/37/processor_tool.txt similarity index 100% rename from testing/37/processor_tool.txt rename to testing/risp/37/processor_tool.txt diff --git a/testing/38/correct_output.txt b/testing/risp/38/correct_output.txt similarity index 100% rename from testing/38/correct_output.txt rename to testing/risp/38/correct_output.txt diff --git a/testing/38/label.txt b/testing/risp/38/label.txt similarity index 100% rename from testing/38/label.txt rename to testing/risp/38/label.txt diff --git a/testing/38/network_tool.txt b/testing/risp/38/network_tool.txt similarity index 100% rename from testing/38/network_tool.txt rename to testing/risp/38/network_tool.txt diff --git a/testing/38/processor.sh b/testing/risp/38/processor.sh similarity index 100% rename from testing/38/processor.sh rename to testing/risp/38/processor.sh diff --git a/testing/38/processor_tool.txt b/testing/risp/38/processor_tool.txt similarity index 100% rename from testing/38/processor_tool.txt rename to testing/risp/38/processor_tool.txt diff --git a/testing/39/correct_output.txt b/testing/risp/39/correct_output.txt similarity index 100% rename from testing/39/correct_output.txt rename to testing/risp/39/correct_output.txt diff --git a/testing/39/label.txt b/testing/risp/39/label.txt similarity index 100% rename from testing/39/label.txt rename to testing/risp/39/label.txt diff --git a/testing/39/network_tool.txt b/testing/risp/39/network_tool.txt similarity index 100% rename from testing/39/network_tool.txt rename to testing/risp/39/network_tool.txt diff --git a/testing/39/processor.sh b/testing/risp/39/processor.sh similarity index 100% rename from testing/39/processor.sh rename to testing/risp/39/processor.sh diff --git a/testing/39/processor_tool.txt b/testing/risp/39/processor_tool.txt similarity index 100% rename from testing/39/processor_tool.txt rename to testing/risp/39/processor_tool.txt diff --git a/testing/40/correct_output.txt b/testing/risp/40/correct_output.txt similarity index 100% rename from testing/40/correct_output.txt rename to testing/risp/40/correct_output.txt diff --git a/testing/40/label.txt b/testing/risp/40/label.txt similarity index 100% rename from testing/40/label.txt rename to testing/risp/40/label.txt diff --git a/testing/40/network_tool.txt b/testing/risp/40/network_tool.txt similarity index 100% rename from testing/40/network_tool.txt rename to testing/risp/40/network_tool.txt diff --git a/testing/40/processor.sh b/testing/risp/40/processor.sh similarity index 100% rename from testing/40/processor.sh rename to testing/risp/40/processor.sh diff --git a/testing/40/processor_tool.txt b/testing/risp/40/processor_tool.txt similarity index 100% rename from testing/40/processor_tool.txt rename to testing/risp/40/processor_tool.txt diff --git a/testing/41/correct_output.txt b/testing/risp/41/correct_output.txt similarity index 100% rename from testing/41/correct_output.txt rename to testing/risp/41/correct_output.txt diff --git a/testing/41/label.txt b/testing/risp/41/label.txt similarity index 100% rename from testing/41/label.txt rename to testing/risp/41/label.txt diff --git a/testing/41/network_tool.txt b/testing/risp/41/network_tool.txt similarity index 100% rename from testing/41/network_tool.txt rename to testing/risp/41/network_tool.txt diff --git a/testing/41/processor.sh b/testing/risp/41/processor.sh similarity index 100% rename from testing/41/processor.sh rename to testing/risp/41/processor.sh diff --git a/testing/41/processor_tool.txt b/testing/risp/41/processor_tool.txt similarity index 100% rename from testing/41/processor_tool.txt rename to testing/risp/41/processor_tool.txt diff --git a/testing/42/correct_output.txt b/testing/risp/42/correct_output.txt similarity index 100% rename from testing/42/correct_output.txt rename to testing/risp/42/correct_output.txt diff --git a/testing/42/label.txt b/testing/risp/42/label.txt similarity index 100% rename from testing/42/label.txt rename to testing/risp/42/label.txt diff --git a/testing/42/network_tool.txt b/testing/risp/42/network_tool.txt similarity index 100% rename from testing/42/network_tool.txt rename to testing/risp/42/network_tool.txt diff --git a/testing/42/processor.sh b/testing/risp/42/processor.sh similarity index 100% rename from testing/42/processor.sh rename to testing/risp/42/processor.sh diff --git a/testing/42/processor_tool.txt b/testing/risp/42/processor_tool.txt similarity index 100% rename from testing/42/processor_tool.txt rename to testing/risp/42/processor_tool.txt diff --git a/testing/43/correct_output.txt b/testing/risp/43/correct_output.txt similarity index 100% rename from testing/43/correct_output.txt rename to testing/risp/43/correct_output.txt diff --git a/testing/43/label.txt b/testing/risp/43/label.txt similarity index 100% rename from testing/43/label.txt rename to testing/risp/43/label.txt diff --git a/testing/43/network_tool.txt b/testing/risp/43/network_tool.txt similarity index 100% rename from testing/43/network_tool.txt rename to testing/risp/43/network_tool.txt diff --git a/testing/43/processor.sh b/testing/risp/43/processor.sh similarity index 100% rename from testing/43/processor.sh rename to testing/risp/43/processor.sh diff --git a/testing/43/processor_tool.txt b/testing/risp/43/processor_tool.txt similarity index 100% rename from testing/43/processor_tool.txt rename to testing/risp/43/processor_tool.txt diff --git a/testing/44/correct_output.txt b/testing/risp/44/correct_output.txt similarity index 100% rename from testing/44/correct_output.txt rename to testing/risp/44/correct_output.txt diff --git a/testing/44/label.txt b/testing/risp/44/label.txt similarity index 100% rename from testing/44/label.txt rename to testing/risp/44/label.txt diff --git a/testing/44/network_tool.txt b/testing/risp/44/network_tool.txt similarity index 100% rename from testing/44/network_tool.txt rename to testing/risp/44/network_tool.txt diff --git a/testing/44/processor.sh b/testing/risp/44/processor.sh similarity index 100% rename from testing/44/processor.sh rename to testing/risp/44/processor.sh diff --git a/testing/44/processor_tool.txt b/testing/risp/44/processor_tool.txt similarity index 100% rename from testing/44/processor_tool.txt rename to testing/risp/44/processor_tool.txt diff --git a/testing/45/correct_output.txt b/testing/risp/45/correct_output.txt similarity index 100% rename from testing/45/correct_output.txt rename to testing/risp/45/correct_output.txt diff --git a/testing/45/label.txt b/testing/risp/45/label.txt similarity index 100% rename from testing/45/label.txt rename to testing/risp/45/label.txt diff --git a/testing/45/network_tool.txt b/testing/risp/45/network_tool.txt similarity index 100% rename from testing/45/network_tool.txt rename to testing/risp/45/network_tool.txt diff --git a/testing/45/processor.sh b/testing/risp/45/processor.sh similarity index 100% rename from testing/45/processor.sh rename to testing/risp/45/processor.sh diff --git a/testing/45/processor_tool.txt b/testing/risp/45/processor_tool.txt similarity index 100% rename from testing/45/processor_tool.txt rename to testing/risp/45/processor_tool.txt diff --git a/testing/46/correct_output.txt b/testing/risp/46/correct_output.txt similarity index 100% rename from testing/46/correct_output.txt rename to testing/risp/46/correct_output.txt diff --git a/testing/46/label.txt b/testing/risp/46/label.txt similarity index 100% rename from testing/46/label.txt rename to testing/risp/46/label.txt diff --git a/testing/46/network_tool.txt b/testing/risp/46/network_tool.txt similarity index 100% rename from testing/46/network_tool.txt rename to testing/risp/46/network_tool.txt diff --git a/testing/46/processor.sh b/testing/risp/46/processor.sh similarity index 100% rename from testing/46/processor.sh rename to testing/risp/46/processor.sh diff --git a/testing/46/processor_tool.txt b/testing/risp/46/processor_tool.txt similarity index 100% rename from testing/46/processor_tool.txt rename to testing/risp/46/processor_tool.txt diff --git a/testing/47/correct_output.txt b/testing/risp/47/correct_output.txt similarity index 100% rename from testing/47/correct_output.txt rename to testing/risp/47/correct_output.txt diff --git a/testing/47/label.txt b/testing/risp/47/label.txt similarity index 100% rename from testing/47/label.txt rename to testing/risp/47/label.txt diff --git a/testing/47/network_tool.txt b/testing/risp/47/network_tool.txt similarity index 100% rename from testing/47/network_tool.txt rename to testing/risp/47/network_tool.txt diff --git a/testing/47/processor.sh b/testing/risp/47/processor.sh similarity index 100% rename from testing/47/processor.sh rename to testing/risp/47/processor.sh diff --git a/testing/47/processor_tool.txt b/testing/risp/47/processor_tool.txt similarity index 100% rename from testing/47/processor_tool.txt rename to testing/risp/47/processor_tool.txt diff --git a/testing/48/correct_output.txt b/testing/risp/48/correct_output.txt similarity index 100% rename from testing/48/correct_output.txt rename to testing/risp/48/correct_output.txt diff --git a/testing/48/label.txt b/testing/risp/48/label.txt similarity index 100% rename from testing/48/label.txt rename to testing/risp/48/label.txt diff --git a/testing/48/network_tool.txt b/testing/risp/48/network_tool.txt similarity index 100% rename from testing/48/network_tool.txt rename to testing/risp/48/network_tool.txt diff --git a/testing/48/processor.sh b/testing/risp/48/processor.sh similarity index 100% rename from testing/48/processor.sh rename to testing/risp/48/processor.sh diff --git a/testing/48/processor_tool.txt b/testing/risp/48/processor_tool.txt similarity index 100% rename from testing/48/processor_tool.txt rename to testing/risp/48/processor_tool.txt diff --git a/testing/49/correct_output.txt b/testing/risp/49/correct_output.txt similarity index 100% rename from testing/49/correct_output.txt rename to testing/risp/49/correct_output.txt diff --git a/testing/49/label.txt b/testing/risp/49/label.txt similarity index 100% rename from testing/49/label.txt rename to testing/risp/49/label.txt diff --git a/testing/49/network_tool.txt b/testing/risp/49/network_tool.txt similarity index 100% rename from testing/49/network_tool.txt rename to testing/risp/49/network_tool.txt diff --git a/testing/49/processor.sh b/testing/risp/49/processor.sh similarity index 100% rename from testing/49/processor.sh rename to testing/risp/49/processor.sh diff --git a/testing/49/processor_tool.txt b/testing/risp/49/processor_tool.txt similarity index 100% rename from testing/49/processor_tool.txt rename to testing/risp/49/processor_tool.txt diff --git a/testing/50/correct_output.txt b/testing/risp/50/correct_output.txt similarity index 100% rename from testing/50/correct_output.txt rename to testing/risp/50/correct_output.txt diff --git a/testing/50/label.txt b/testing/risp/50/label.txt similarity index 100% rename from testing/50/label.txt rename to testing/risp/50/label.txt diff --git a/testing/50/network_tool.txt b/testing/risp/50/network_tool.txt similarity index 100% rename from testing/50/network_tool.txt rename to testing/risp/50/network_tool.txt diff --git a/testing/50/processor.sh b/testing/risp/50/processor.sh similarity index 100% rename from testing/50/processor.sh rename to testing/risp/50/processor.sh diff --git a/testing/50/processor_tool.txt b/testing/risp/50/processor_tool.txt similarity index 100% rename from testing/50/processor_tool.txt rename to testing/risp/50/processor_tool.txt diff --git a/testing/51/correct_output.txt b/testing/risp/51/correct_output.txt similarity index 100% rename from testing/51/correct_output.txt rename to testing/risp/51/correct_output.txt diff --git a/testing/51/label.txt b/testing/risp/51/label.txt similarity index 100% rename from testing/51/label.txt rename to testing/risp/51/label.txt diff --git a/testing/51/network_tool.txt b/testing/risp/51/network_tool.txt similarity index 100% rename from testing/51/network_tool.txt rename to testing/risp/51/network_tool.txt diff --git a/testing/51/processor.sh b/testing/risp/51/processor.sh similarity index 100% rename from testing/51/processor.sh rename to testing/risp/51/processor.sh diff --git a/testing/51/processor_tool.txt b/testing/risp/51/processor_tool.txt similarity index 100% rename from testing/51/processor_tool.txt rename to testing/risp/51/processor_tool.txt diff --git a/testing/52/correct_output.txt b/testing/risp/52/correct_output.txt similarity index 100% rename from testing/52/correct_output.txt rename to testing/risp/52/correct_output.txt diff --git a/testing/52/label.txt b/testing/risp/52/label.txt similarity index 100% rename from testing/52/label.txt rename to testing/risp/52/label.txt diff --git a/testing/52/network_tool.txt b/testing/risp/52/network_tool.txt similarity index 100% rename from testing/52/network_tool.txt rename to testing/risp/52/network_tool.txt diff --git a/testing/52/processor.sh b/testing/risp/52/processor.sh similarity index 100% rename from testing/52/processor.sh rename to testing/risp/52/processor.sh diff --git a/testing/52/processor_tool.txt b/testing/risp/52/processor_tool.txt similarity index 100% rename from testing/52/processor_tool.txt rename to testing/risp/52/processor_tool.txt diff --git a/vrisp_testing/01/correct_output.txt b/testing/vrisp/01/correct_output.txt similarity index 100% rename from vrisp_testing/01/correct_output.txt rename to testing/vrisp/01/correct_output.txt diff --git a/vrisp_testing/01/label.txt b/testing/vrisp/01/label.txt similarity index 100% rename from vrisp_testing/01/label.txt rename to testing/vrisp/01/label.txt diff --git a/vrisp_testing/01/network_tool.txt b/testing/vrisp/01/network_tool.txt similarity index 100% rename from vrisp_testing/01/network_tool.txt rename to testing/vrisp/01/network_tool.txt diff --git a/vrisp_testing/01/processor.sh b/testing/vrisp/01/processor.sh similarity index 100% rename from vrisp_testing/01/processor.sh rename to testing/vrisp/01/processor.sh diff --git a/vrisp_testing/01/processor_tool.txt b/testing/vrisp/01/processor_tool.txt similarity index 100% rename from vrisp_testing/01/processor_tool.txt rename to testing/vrisp/01/processor_tool.txt diff --git a/vrisp_testing/02/correct_output.txt b/testing/vrisp/02/correct_output.txt similarity index 100% rename from vrisp_testing/02/correct_output.txt rename to testing/vrisp/02/correct_output.txt diff --git a/vrisp_testing/02/label.txt b/testing/vrisp/02/label.txt similarity index 100% rename from vrisp_testing/02/label.txt rename to testing/vrisp/02/label.txt diff --git a/vrisp_testing/02/network_tool.txt b/testing/vrisp/02/network_tool.txt similarity index 100% rename from vrisp_testing/02/network_tool.txt rename to testing/vrisp/02/network_tool.txt diff --git a/vrisp_testing/02/processor.sh b/testing/vrisp/02/processor.sh similarity index 100% rename from vrisp_testing/02/processor.sh rename to testing/vrisp/02/processor.sh diff --git a/vrisp_testing/02/processor_tool.txt b/testing/vrisp/02/processor_tool.txt similarity index 100% rename from vrisp_testing/02/processor_tool.txt rename to testing/vrisp/02/processor_tool.txt diff --git a/vrisp_testing/03/correct_output.txt b/testing/vrisp/03/correct_output.txt similarity index 100% rename from vrisp_testing/03/correct_output.txt rename to testing/vrisp/03/correct_output.txt diff --git a/vrisp_testing/03/label.txt b/testing/vrisp/03/label.txt similarity index 100% rename from vrisp_testing/03/label.txt rename to testing/vrisp/03/label.txt diff --git a/vrisp_testing/03/network_tool.txt b/testing/vrisp/03/network_tool.txt similarity index 100% rename from vrisp_testing/03/network_tool.txt rename to testing/vrisp/03/network_tool.txt diff --git a/vrisp_testing/03/processor.sh b/testing/vrisp/03/processor.sh similarity index 100% rename from vrisp_testing/03/processor.sh rename to testing/vrisp/03/processor.sh diff --git a/vrisp_testing/03/processor_tool.txt b/testing/vrisp/03/processor_tool.txt similarity index 100% rename from vrisp_testing/03/processor_tool.txt rename to testing/vrisp/03/processor_tool.txt diff --git a/vrisp_testing/04/correct_output.txt b/testing/vrisp/04/correct_output.txt similarity index 100% rename from vrisp_testing/04/correct_output.txt rename to testing/vrisp/04/correct_output.txt diff --git a/vrisp_testing/04/label.txt b/testing/vrisp/04/label.txt similarity index 100% rename from vrisp_testing/04/label.txt rename to testing/vrisp/04/label.txt diff --git a/vrisp_testing/04/network_tool.txt b/testing/vrisp/04/network_tool.txt similarity index 100% rename from vrisp_testing/04/network_tool.txt rename to testing/vrisp/04/network_tool.txt diff --git a/vrisp_testing/04/processor.sh b/testing/vrisp/04/processor.sh similarity index 100% rename from vrisp_testing/04/processor.sh rename to testing/vrisp/04/processor.sh diff --git a/vrisp_testing/04/processor_tool.txt b/testing/vrisp/04/processor_tool.txt similarity index 100% rename from vrisp_testing/04/processor_tool.txt rename to testing/vrisp/04/processor_tool.txt diff --git a/vrisp_testing/05/correct_output.txt b/testing/vrisp/05/correct_output.txt similarity index 100% rename from vrisp_testing/05/correct_output.txt rename to testing/vrisp/05/correct_output.txt diff --git a/vrisp_testing/05/label.txt b/testing/vrisp/05/label.txt similarity index 100% rename from vrisp_testing/05/label.txt rename to testing/vrisp/05/label.txt diff --git a/vrisp_testing/05/network_tool.txt b/testing/vrisp/05/network_tool.txt similarity index 100% rename from vrisp_testing/05/network_tool.txt rename to testing/vrisp/05/network_tool.txt diff --git a/vrisp_testing/05/processor.sh b/testing/vrisp/05/processor.sh similarity index 100% rename from vrisp_testing/05/processor.sh rename to testing/vrisp/05/processor.sh diff --git a/vrisp_testing/05/processor_tool.txt b/testing/vrisp/05/processor_tool.txt similarity index 100% rename from vrisp_testing/05/processor_tool.txt rename to testing/vrisp/05/processor_tool.txt diff --git a/vrisp_testing/06/correct_output.txt b/testing/vrisp/06/correct_output.txt similarity index 100% rename from vrisp_testing/06/correct_output.txt rename to testing/vrisp/06/correct_output.txt diff --git a/vrisp_testing/06/label.txt b/testing/vrisp/06/label.txt similarity index 100% rename from vrisp_testing/06/label.txt rename to testing/vrisp/06/label.txt diff --git a/vrisp_testing/06/network_tool.txt b/testing/vrisp/06/network_tool.txt similarity index 100% rename from vrisp_testing/06/network_tool.txt rename to testing/vrisp/06/network_tool.txt diff --git a/vrisp_testing/06/processor.sh b/testing/vrisp/06/processor.sh similarity index 100% rename from vrisp_testing/06/processor.sh rename to testing/vrisp/06/processor.sh diff --git a/vrisp_testing/06/processor_tool.txt b/testing/vrisp/06/processor_tool.txt similarity index 100% rename from vrisp_testing/06/processor_tool.txt rename to testing/vrisp/06/processor_tool.txt diff --git a/vrisp_testing/07/correct_output.txt b/testing/vrisp/07/correct_output.txt similarity index 100% rename from vrisp_testing/07/correct_output.txt rename to testing/vrisp/07/correct_output.txt diff --git a/vrisp_testing/07/label.txt b/testing/vrisp/07/label.txt similarity index 100% rename from vrisp_testing/07/label.txt rename to testing/vrisp/07/label.txt diff --git a/vrisp_testing/07/network_tool.txt b/testing/vrisp/07/network_tool.txt similarity index 100% rename from vrisp_testing/07/network_tool.txt rename to testing/vrisp/07/network_tool.txt diff --git a/vrisp_testing/07/processor.sh b/testing/vrisp/07/processor.sh similarity index 100% rename from vrisp_testing/07/processor.sh rename to testing/vrisp/07/processor.sh diff --git a/vrisp_testing/07/processor_tool.txt b/testing/vrisp/07/processor_tool.txt similarity index 100% rename from vrisp_testing/07/processor_tool.txt rename to testing/vrisp/07/processor_tool.txt diff --git a/vrisp_testing/08/correct_output.txt b/testing/vrisp/08/correct_output.txt similarity index 100% rename from vrisp_testing/08/correct_output.txt rename to testing/vrisp/08/correct_output.txt diff --git a/vrisp_testing/08/label.txt b/testing/vrisp/08/label.txt similarity index 100% rename from vrisp_testing/08/label.txt rename to testing/vrisp/08/label.txt diff --git a/vrisp_testing/08/network_tool.txt b/testing/vrisp/08/network_tool.txt similarity index 100% rename from vrisp_testing/08/network_tool.txt rename to testing/vrisp/08/network_tool.txt diff --git a/vrisp_testing/08/processor.sh b/testing/vrisp/08/processor.sh similarity index 100% rename from vrisp_testing/08/processor.sh rename to testing/vrisp/08/processor.sh diff --git a/vrisp_testing/08/processor_tool.txt b/testing/vrisp/08/processor_tool.txt similarity index 100% rename from vrisp_testing/08/processor_tool.txt rename to testing/vrisp/08/processor_tool.txt diff --git a/vrisp_testing/09/correct_output.txt b/testing/vrisp/09/correct_output.txt similarity index 100% rename from vrisp_testing/09/correct_output.txt rename to testing/vrisp/09/correct_output.txt diff --git a/vrisp_testing/09/label.txt b/testing/vrisp/09/label.txt similarity index 100% rename from vrisp_testing/09/label.txt rename to testing/vrisp/09/label.txt diff --git a/vrisp_testing/09/network_tool.txt b/testing/vrisp/09/network_tool.txt similarity index 100% rename from vrisp_testing/09/network_tool.txt rename to testing/vrisp/09/network_tool.txt diff --git a/vrisp_testing/09/processor.sh b/testing/vrisp/09/processor.sh similarity index 100% rename from vrisp_testing/09/processor.sh rename to testing/vrisp/09/processor.sh diff --git a/vrisp_testing/09/processor_tool.txt b/testing/vrisp/09/processor_tool.txt similarity index 100% rename from vrisp_testing/09/processor_tool.txt rename to testing/vrisp/09/processor_tool.txt diff --git a/vrisp_testing/10/correct_output.txt b/testing/vrisp/10/correct_output.txt similarity index 100% rename from vrisp_testing/10/correct_output.txt rename to testing/vrisp/10/correct_output.txt diff --git a/vrisp_testing/10/label.txt b/testing/vrisp/10/label.txt similarity index 100% rename from vrisp_testing/10/label.txt rename to testing/vrisp/10/label.txt diff --git a/vrisp_testing/10/network_tool.txt b/testing/vrisp/10/network_tool.txt similarity index 100% rename from vrisp_testing/10/network_tool.txt rename to testing/vrisp/10/network_tool.txt diff --git a/vrisp_testing/10/processor.sh b/testing/vrisp/10/processor.sh similarity index 100% rename from vrisp_testing/10/processor.sh rename to testing/vrisp/10/processor.sh diff --git a/vrisp_testing/10/processor_tool.txt b/testing/vrisp/10/processor_tool.txt similarity index 100% rename from vrisp_testing/10/processor_tool.txt rename to testing/vrisp/10/processor_tool.txt diff --git a/vrisp_testing/11/correct_output.txt b/testing/vrisp/11/correct_output.txt similarity index 100% rename from vrisp_testing/11/correct_output.txt rename to testing/vrisp/11/correct_output.txt diff --git a/vrisp_testing/11/label.txt b/testing/vrisp/11/label.txt similarity index 100% rename from vrisp_testing/11/label.txt rename to testing/vrisp/11/label.txt diff --git a/vrisp_testing/11/network_tool.txt b/testing/vrisp/11/network_tool.txt similarity index 100% rename from vrisp_testing/11/network_tool.txt rename to testing/vrisp/11/network_tool.txt diff --git a/vrisp_testing/11/processor.sh b/testing/vrisp/11/processor.sh similarity index 100% rename from vrisp_testing/11/processor.sh rename to testing/vrisp/11/processor.sh diff --git a/vrisp_testing/11/processor_tool.txt b/testing/vrisp/11/processor_tool.txt similarity index 100% rename from vrisp_testing/11/processor_tool.txt rename to testing/vrisp/11/processor_tool.txt diff --git a/vrisp_testing/12/correct_output.txt b/testing/vrisp/12/correct_output.txt similarity index 100% rename from vrisp_testing/12/correct_output.txt rename to testing/vrisp/12/correct_output.txt diff --git a/vrisp_testing/12/label.txt b/testing/vrisp/12/label.txt similarity index 100% rename from vrisp_testing/12/label.txt rename to testing/vrisp/12/label.txt diff --git a/vrisp_testing/12/network_tool.txt b/testing/vrisp/12/network_tool.txt similarity index 100% rename from vrisp_testing/12/network_tool.txt rename to testing/vrisp/12/network_tool.txt diff --git a/vrisp_testing/12/processor.sh b/testing/vrisp/12/processor.sh similarity index 100% rename from vrisp_testing/12/processor.sh rename to testing/vrisp/12/processor.sh diff --git a/vrisp_testing/12/processor_tool.txt b/testing/vrisp/12/processor_tool.txt similarity index 100% rename from vrisp_testing/12/processor_tool.txt rename to testing/vrisp/12/processor_tool.txt diff --git a/vrisp_testing/13/correct_output.txt b/testing/vrisp/13/correct_output.txt similarity index 100% rename from vrisp_testing/13/correct_output.txt rename to testing/vrisp/13/correct_output.txt diff --git a/vrisp_testing/13/label.txt b/testing/vrisp/13/label.txt similarity index 100% rename from vrisp_testing/13/label.txt rename to testing/vrisp/13/label.txt diff --git a/vrisp_testing/13/network_tool.txt b/testing/vrisp/13/network_tool.txt similarity index 100% rename from vrisp_testing/13/network_tool.txt rename to testing/vrisp/13/network_tool.txt diff --git a/vrisp_testing/13/processor.sh b/testing/vrisp/13/processor.sh similarity index 100% rename from vrisp_testing/13/processor.sh rename to testing/vrisp/13/processor.sh diff --git a/vrisp_testing/13/processor_tool.txt b/testing/vrisp/13/processor_tool.txt similarity index 100% rename from vrisp_testing/13/processor_tool.txt rename to testing/vrisp/13/processor_tool.txt diff --git a/vrisp_testing/14/correct_output.txt b/testing/vrisp/14/correct_output.txt similarity index 100% rename from vrisp_testing/14/correct_output.txt rename to testing/vrisp/14/correct_output.txt diff --git a/vrisp_testing/14/label.txt b/testing/vrisp/14/label.txt similarity index 100% rename from vrisp_testing/14/label.txt rename to testing/vrisp/14/label.txt diff --git a/vrisp_testing/14/network_tool.txt b/testing/vrisp/14/network_tool.txt similarity index 100% rename from vrisp_testing/14/network_tool.txt rename to testing/vrisp/14/network_tool.txt diff --git a/vrisp_testing/14/processor.sh b/testing/vrisp/14/processor.sh similarity index 100% rename from vrisp_testing/14/processor.sh rename to testing/vrisp/14/processor.sh diff --git a/vrisp_testing/14/processor_tool.txt b/testing/vrisp/14/processor_tool.txt similarity index 100% rename from vrisp_testing/14/processor_tool.txt rename to testing/vrisp/14/processor_tool.txt diff --git a/vrisp_testing/15/correct_output.txt b/testing/vrisp/15/correct_output.txt similarity index 100% rename from vrisp_testing/15/correct_output.txt rename to testing/vrisp/15/correct_output.txt diff --git a/vrisp_testing/15/label.txt b/testing/vrisp/15/label.txt similarity index 100% rename from vrisp_testing/15/label.txt rename to testing/vrisp/15/label.txt diff --git a/vrisp_testing/15/network_tool.txt b/testing/vrisp/15/network_tool.txt similarity index 100% rename from vrisp_testing/15/network_tool.txt rename to testing/vrisp/15/network_tool.txt diff --git a/vrisp_testing/15/processor.sh b/testing/vrisp/15/processor.sh similarity index 100% rename from vrisp_testing/15/processor.sh rename to testing/vrisp/15/processor.sh diff --git a/vrisp_testing/15/processor_tool.txt b/testing/vrisp/15/processor_tool.txt similarity index 100% rename from vrisp_testing/15/processor_tool.txt rename to testing/vrisp/15/processor_tool.txt diff --git a/vrisp_testing/16/correct_output.txt b/testing/vrisp/16/correct_output.txt similarity index 100% rename from vrisp_testing/16/correct_output.txt rename to testing/vrisp/16/correct_output.txt diff --git a/vrisp_testing/16/label.txt b/testing/vrisp/16/label.txt similarity index 100% rename from vrisp_testing/16/label.txt rename to testing/vrisp/16/label.txt diff --git a/vrisp_testing/16/network_tool.txt b/testing/vrisp/16/network_tool.txt similarity index 100% rename from vrisp_testing/16/network_tool.txt rename to testing/vrisp/16/network_tool.txt diff --git a/vrisp_testing/16/processor.sh b/testing/vrisp/16/processor.sh similarity index 100% rename from vrisp_testing/16/processor.sh rename to testing/vrisp/16/processor.sh diff --git a/vrisp_testing/16/processor_tool.txt b/testing/vrisp/16/processor_tool.txt similarity index 100% rename from vrisp_testing/16/processor_tool.txt rename to testing/vrisp/16/processor_tool.txt diff --git a/vrisp_testing/17/correct_output.txt b/testing/vrisp/17/correct_output.txt similarity index 100% rename from vrisp_testing/17/correct_output.txt rename to testing/vrisp/17/correct_output.txt diff --git a/vrisp_testing/17/label.txt b/testing/vrisp/17/label.txt similarity index 100% rename from vrisp_testing/17/label.txt rename to testing/vrisp/17/label.txt diff --git a/vrisp_testing/17/network_tool.txt b/testing/vrisp/17/network_tool.txt similarity index 100% rename from vrisp_testing/17/network_tool.txt rename to testing/vrisp/17/network_tool.txt diff --git a/vrisp_testing/17/processor.sh b/testing/vrisp/17/processor.sh similarity index 100% rename from vrisp_testing/17/processor.sh rename to testing/vrisp/17/processor.sh diff --git a/vrisp_testing/17/processor_tool.txt b/testing/vrisp/17/processor_tool.txt similarity index 100% rename from vrisp_testing/17/processor_tool.txt rename to testing/vrisp/17/processor_tool.txt diff --git a/vrisp_testing/18/correct_output.txt b/testing/vrisp/18/correct_output.txt similarity index 100% rename from vrisp_testing/18/correct_output.txt rename to testing/vrisp/18/correct_output.txt diff --git a/vrisp_testing/18/label.txt b/testing/vrisp/18/label.txt similarity index 100% rename from vrisp_testing/18/label.txt rename to testing/vrisp/18/label.txt diff --git a/vrisp_testing/18/network_tool.txt b/testing/vrisp/18/network_tool.txt similarity index 100% rename from vrisp_testing/18/network_tool.txt rename to testing/vrisp/18/network_tool.txt diff --git a/vrisp_testing/18/processor.sh b/testing/vrisp/18/processor.sh similarity index 100% rename from vrisp_testing/18/processor.sh rename to testing/vrisp/18/processor.sh diff --git a/vrisp_testing/18/processor_tool.txt b/testing/vrisp/18/processor_tool.txt similarity index 100% rename from vrisp_testing/18/processor_tool.txt rename to testing/vrisp/18/processor_tool.txt diff --git a/vrisp_testing/19/correct_output.txt b/testing/vrisp/19/correct_output.txt similarity index 100% rename from vrisp_testing/19/correct_output.txt rename to testing/vrisp/19/correct_output.txt diff --git a/vrisp_testing/19/label.txt b/testing/vrisp/19/label.txt similarity index 100% rename from vrisp_testing/19/label.txt rename to testing/vrisp/19/label.txt diff --git a/vrisp_testing/19/network_tool.txt b/testing/vrisp/19/network_tool.txt similarity index 100% rename from vrisp_testing/19/network_tool.txt rename to testing/vrisp/19/network_tool.txt diff --git a/vrisp_testing/19/processor.sh b/testing/vrisp/19/processor.sh similarity index 100% rename from vrisp_testing/19/processor.sh rename to testing/vrisp/19/processor.sh diff --git a/vrisp_testing/19/processor_tool.txt b/testing/vrisp/19/processor_tool.txt similarity index 100% rename from vrisp_testing/19/processor_tool.txt rename to testing/vrisp/19/processor_tool.txt diff --git a/vrisp_testing/20/correct_output.txt b/testing/vrisp/20/correct_output.txt similarity index 100% rename from vrisp_testing/20/correct_output.txt rename to testing/vrisp/20/correct_output.txt diff --git a/vrisp_testing/20/label.txt b/testing/vrisp/20/label.txt similarity index 100% rename from vrisp_testing/20/label.txt rename to testing/vrisp/20/label.txt diff --git a/vrisp_testing/20/network_tool.txt b/testing/vrisp/20/network_tool.txt similarity index 100% rename from vrisp_testing/20/network_tool.txt rename to testing/vrisp/20/network_tool.txt diff --git a/vrisp_testing/20/processor.sh b/testing/vrisp/20/processor.sh similarity index 100% rename from vrisp_testing/20/processor.sh rename to testing/vrisp/20/processor.sh diff --git a/vrisp_testing/20/processor_tool.txt b/testing/vrisp/20/processor_tool.txt similarity index 100% rename from vrisp_testing/20/processor_tool.txt rename to testing/vrisp/20/processor_tool.txt diff --git a/vrisp_testing/21/correct_output.txt b/testing/vrisp/21/correct_output.txt similarity index 100% rename from vrisp_testing/21/correct_output.txt rename to testing/vrisp/21/correct_output.txt diff --git a/vrisp_testing/21/label.txt b/testing/vrisp/21/label.txt similarity index 100% rename from vrisp_testing/21/label.txt rename to testing/vrisp/21/label.txt diff --git a/vrisp_testing/21/network_tool.txt b/testing/vrisp/21/network_tool.txt similarity index 100% rename from vrisp_testing/21/network_tool.txt rename to testing/vrisp/21/network_tool.txt diff --git a/vrisp_testing/21/processor.sh b/testing/vrisp/21/processor.sh similarity index 100% rename from vrisp_testing/21/processor.sh rename to testing/vrisp/21/processor.sh diff --git a/vrisp_testing/21/processor_tool.txt b/testing/vrisp/21/processor_tool.txt similarity index 100% rename from vrisp_testing/21/processor_tool.txt rename to testing/vrisp/21/processor_tool.txt diff --git a/vrisp_testing/22/correct_output.txt b/testing/vrisp/22/correct_output.txt similarity index 100% rename from vrisp_testing/22/correct_output.txt rename to testing/vrisp/22/correct_output.txt diff --git a/vrisp_testing/22/label.txt b/testing/vrisp/22/label.txt similarity index 100% rename from vrisp_testing/22/label.txt rename to testing/vrisp/22/label.txt diff --git a/vrisp_testing/22/network_tool.txt b/testing/vrisp/22/network_tool.txt similarity index 100% rename from vrisp_testing/22/network_tool.txt rename to testing/vrisp/22/network_tool.txt diff --git a/vrisp_testing/22/processor.sh b/testing/vrisp/22/processor.sh similarity index 100% rename from vrisp_testing/22/processor.sh rename to testing/vrisp/22/processor.sh diff --git a/vrisp_testing/22/processor_tool.txt b/testing/vrisp/22/processor_tool.txt similarity index 100% rename from vrisp_testing/22/processor_tool.txt rename to testing/vrisp/22/processor_tool.txt diff --git a/vrisp_testing/23/correct_output.txt b/testing/vrisp/23/correct_output.txt similarity index 100% rename from vrisp_testing/23/correct_output.txt rename to testing/vrisp/23/correct_output.txt diff --git a/vrisp_testing/23/label.txt b/testing/vrisp/23/label.txt similarity index 100% rename from vrisp_testing/23/label.txt rename to testing/vrisp/23/label.txt diff --git a/vrisp_testing/23/network_tool.txt b/testing/vrisp/23/network_tool.txt similarity index 100% rename from vrisp_testing/23/network_tool.txt rename to testing/vrisp/23/network_tool.txt diff --git a/vrisp_testing/23/processor.sh b/testing/vrisp/23/processor.sh similarity index 100% rename from vrisp_testing/23/processor.sh rename to testing/vrisp/23/processor.sh diff --git a/vrisp_testing/23/processor_tool.txt b/testing/vrisp/23/processor_tool.txt similarity index 100% rename from vrisp_testing/23/processor_tool.txt rename to testing/vrisp/23/processor_tool.txt diff --git a/vrisp_testing/24/correct_output.txt b/testing/vrisp/24/correct_output.txt similarity index 100% rename from vrisp_testing/24/correct_output.txt rename to testing/vrisp/24/correct_output.txt diff --git a/vrisp_testing/24/label.txt b/testing/vrisp/24/label.txt similarity index 100% rename from vrisp_testing/24/label.txt rename to testing/vrisp/24/label.txt diff --git a/vrisp_testing/24/network_tool.txt b/testing/vrisp/24/network_tool.txt similarity index 100% rename from vrisp_testing/24/network_tool.txt rename to testing/vrisp/24/network_tool.txt diff --git a/vrisp_testing/24/processor.sh b/testing/vrisp/24/processor.sh similarity index 100% rename from vrisp_testing/24/processor.sh rename to testing/vrisp/24/processor.sh diff --git a/vrisp_testing/24/processor_tool.txt b/testing/vrisp/24/processor_tool.txt similarity index 100% rename from vrisp_testing/24/processor_tool.txt rename to testing/vrisp/24/processor_tool.txt diff --git a/vrisp_testing/25/correct_output.txt b/testing/vrisp/25/correct_output.txt similarity index 100% rename from vrisp_testing/25/correct_output.txt rename to testing/vrisp/25/correct_output.txt diff --git a/vrisp_testing/25/label.txt b/testing/vrisp/25/label.txt similarity index 100% rename from vrisp_testing/25/label.txt rename to testing/vrisp/25/label.txt diff --git a/vrisp_testing/25/network_tool.txt b/testing/vrisp/25/network_tool.txt similarity index 100% rename from vrisp_testing/25/network_tool.txt rename to testing/vrisp/25/network_tool.txt diff --git a/vrisp_testing/25/processor.sh b/testing/vrisp/25/processor.sh similarity index 100% rename from vrisp_testing/25/processor.sh rename to testing/vrisp/25/processor.sh diff --git a/vrisp_testing/25/processor_tool.txt b/testing/vrisp/25/processor_tool.txt similarity index 100% rename from vrisp_testing/25/processor_tool.txt rename to testing/vrisp/25/processor_tool.txt diff --git a/vrisp_testing/26/correct_output.txt b/testing/vrisp/26/correct_output.txt similarity index 100% rename from vrisp_testing/26/correct_output.txt rename to testing/vrisp/26/correct_output.txt diff --git a/vrisp_testing/26/label.txt b/testing/vrisp/26/label.txt similarity index 100% rename from vrisp_testing/26/label.txt rename to testing/vrisp/26/label.txt diff --git a/vrisp_testing/26/network_tool.txt b/testing/vrisp/26/network_tool.txt similarity index 100% rename from vrisp_testing/26/network_tool.txt rename to testing/vrisp/26/network_tool.txt diff --git a/vrisp_testing/26/processor.sh b/testing/vrisp/26/processor.sh similarity index 100% rename from vrisp_testing/26/processor.sh rename to testing/vrisp/26/processor.sh diff --git a/vrisp_testing/26/processor_tool.txt b/testing/vrisp/26/processor_tool.txt similarity index 100% rename from vrisp_testing/26/processor_tool.txt rename to testing/vrisp/26/processor_tool.txt diff --git a/vrisp_testing/28/correct_output.txt b/testing/vrisp/28/correct_output.txt similarity index 100% rename from vrisp_testing/28/correct_output.txt rename to testing/vrisp/28/correct_output.txt diff --git a/vrisp_testing/28/label.txt b/testing/vrisp/28/label.txt similarity index 100% rename from vrisp_testing/28/label.txt rename to testing/vrisp/28/label.txt diff --git a/vrisp_testing/28/network_tool.txt b/testing/vrisp/28/network_tool.txt similarity index 100% rename from vrisp_testing/28/network_tool.txt rename to testing/vrisp/28/network_tool.txt diff --git a/vrisp_testing/28/processor.sh b/testing/vrisp/28/processor.sh similarity index 100% rename from vrisp_testing/28/processor.sh rename to testing/vrisp/28/processor.sh diff --git a/vrisp_testing/28/processor_tool.txt b/testing/vrisp/28/processor_tool.txt similarity index 100% rename from vrisp_testing/28/processor_tool.txt rename to testing/vrisp/28/processor_tool.txt diff --git a/vrisp_testing/33/correct_output.txt b/testing/vrisp/33/correct_output.txt similarity index 100% rename from vrisp_testing/33/correct_output.txt rename to testing/vrisp/33/correct_output.txt diff --git a/vrisp_testing/33/label.txt b/testing/vrisp/33/label.txt similarity index 100% rename from vrisp_testing/33/label.txt rename to testing/vrisp/33/label.txt diff --git a/vrisp_testing/33/network_tool.txt b/testing/vrisp/33/network_tool.txt similarity index 100% rename from vrisp_testing/33/network_tool.txt rename to testing/vrisp/33/network_tool.txt diff --git a/vrisp_testing/33/processor.sh b/testing/vrisp/33/processor.sh similarity index 100% rename from vrisp_testing/33/processor.sh rename to testing/vrisp/33/processor.sh diff --git a/vrisp_testing/33/processor_tool.txt b/testing/vrisp/33/processor_tool.txt similarity index 100% rename from vrisp_testing/33/processor_tool.txt rename to testing/vrisp/33/processor_tool.txt diff --git a/vrisp_testing/34/correct_output.txt b/testing/vrisp/34/correct_output.txt similarity index 100% rename from vrisp_testing/34/correct_output.txt rename to testing/vrisp/34/correct_output.txt diff --git a/vrisp_testing/34/label.txt b/testing/vrisp/34/label.txt similarity index 100% rename from vrisp_testing/34/label.txt rename to testing/vrisp/34/label.txt diff --git a/vrisp_testing/34/network_tool.txt b/testing/vrisp/34/network_tool.txt similarity index 100% rename from vrisp_testing/34/network_tool.txt rename to testing/vrisp/34/network_tool.txt diff --git a/vrisp_testing/34/processor.sh b/testing/vrisp/34/processor.sh similarity index 100% rename from vrisp_testing/34/processor.sh rename to testing/vrisp/34/processor.sh diff --git a/vrisp_testing/34/processor_tool.txt b/testing/vrisp/34/processor_tool.txt similarity index 100% rename from vrisp_testing/34/processor_tool.txt rename to testing/vrisp/34/processor_tool.txt diff --git a/vrisp_testing/35/correct_output.txt b/testing/vrisp/35/correct_output.txt similarity index 100% rename from vrisp_testing/35/correct_output.txt rename to testing/vrisp/35/correct_output.txt diff --git a/vrisp_testing/35/label.txt b/testing/vrisp/35/label.txt similarity index 100% rename from vrisp_testing/35/label.txt rename to testing/vrisp/35/label.txt diff --git a/vrisp_testing/35/network_tool.txt b/testing/vrisp/35/network_tool.txt similarity index 100% rename from vrisp_testing/35/network_tool.txt rename to testing/vrisp/35/network_tool.txt diff --git a/vrisp_testing/35/processor.sh b/testing/vrisp/35/processor.sh similarity index 100% rename from vrisp_testing/35/processor.sh rename to testing/vrisp/35/processor.sh diff --git a/vrisp_testing/35/processor_tool.txt b/testing/vrisp/35/processor_tool.txt similarity index 100% rename from vrisp_testing/35/processor_tool.txt rename to testing/vrisp/35/processor_tool.txt diff --git a/vrisp_testing/36/correct_output.txt b/testing/vrisp/36/correct_output.txt similarity index 100% rename from vrisp_testing/36/correct_output.txt rename to testing/vrisp/36/correct_output.txt diff --git a/vrisp_testing/36/label.txt b/testing/vrisp/36/label.txt similarity index 100% rename from vrisp_testing/36/label.txt rename to testing/vrisp/36/label.txt diff --git a/vrisp_testing/36/network_tool.txt b/testing/vrisp/36/network_tool.txt similarity index 100% rename from vrisp_testing/36/network_tool.txt rename to testing/vrisp/36/network_tool.txt diff --git a/vrisp_testing/36/processor.sh b/testing/vrisp/36/processor.sh similarity index 100% rename from vrisp_testing/36/processor.sh rename to testing/vrisp/36/processor.sh diff --git a/vrisp_testing/36/processor_tool.txt b/testing/vrisp/36/processor_tool.txt similarity index 100% rename from vrisp_testing/36/processor_tool.txt rename to testing/vrisp/36/processor_tool.txt diff --git a/vrisp_testing/37/correct_output.txt b/testing/vrisp/37/correct_output.txt similarity index 100% rename from vrisp_testing/37/correct_output.txt rename to testing/vrisp/37/correct_output.txt diff --git a/vrisp_testing/37/label.txt b/testing/vrisp/37/label.txt similarity index 100% rename from vrisp_testing/37/label.txt rename to testing/vrisp/37/label.txt diff --git a/vrisp_testing/37/network_tool.txt b/testing/vrisp/37/network_tool.txt similarity index 100% rename from vrisp_testing/37/network_tool.txt rename to testing/vrisp/37/network_tool.txt diff --git a/vrisp_testing/37/processor.sh b/testing/vrisp/37/processor.sh similarity index 100% rename from vrisp_testing/37/processor.sh rename to testing/vrisp/37/processor.sh diff --git a/vrisp_testing/37/processor_tool.txt b/testing/vrisp/37/processor_tool.txt similarity index 100% rename from vrisp_testing/37/processor_tool.txt rename to testing/vrisp/37/processor_tool.txt diff --git a/vrisp_testing/38/correct_output.txt b/testing/vrisp/38/correct_output.txt similarity index 100% rename from vrisp_testing/38/correct_output.txt rename to testing/vrisp/38/correct_output.txt diff --git a/vrisp_testing/38/label.txt b/testing/vrisp/38/label.txt similarity index 100% rename from vrisp_testing/38/label.txt rename to testing/vrisp/38/label.txt diff --git a/vrisp_testing/38/network_tool.txt b/testing/vrisp/38/network_tool.txt similarity index 100% rename from vrisp_testing/38/network_tool.txt rename to testing/vrisp/38/network_tool.txt diff --git a/vrisp_testing/38/processor.sh b/testing/vrisp/38/processor.sh similarity index 100% rename from vrisp_testing/38/processor.sh rename to testing/vrisp/38/processor.sh diff --git a/vrisp_testing/38/processor_tool.txt b/testing/vrisp/38/processor_tool.txt similarity index 100% rename from vrisp_testing/38/processor_tool.txt rename to testing/vrisp/38/processor_tool.txt diff --git a/vrisp_testing/39/correct_output.txt b/testing/vrisp/39/correct_output.txt similarity index 100% rename from vrisp_testing/39/correct_output.txt rename to testing/vrisp/39/correct_output.txt diff --git a/vrisp_testing/39/label.txt b/testing/vrisp/39/label.txt similarity index 100% rename from vrisp_testing/39/label.txt rename to testing/vrisp/39/label.txt diff --git a/vrisp_testing/39/network_tool.txt b/testing/vrisp/39/network_tool.txt similarity index 100% rename from vrisp_testing/39/network_tool.txt rename to testing/vrisp/39/network_tool.txt diff --git a/vrisp_testing/39/processor.sh b/testing/vrisp/39/processor.sh similarity index 100% rename from vrisp_testing/39/processor.sh rename to testing/vrisp/39/processor.sh diff --git a/vrisp_testing/39/processor_tool.txt b/testing/vrisp/39/processor_tool.txt similarity index 100% rename from vrisp_testing/39/processor_tool.txt rename to testing/vrisp/39/processor_tool.txt diff --git a/vrisp_testing/40/correct_output.txt b/testing/vrisp/40/correct_output.txt similarity index 100% rename from vrisp_testing/40/correct_output.txt rename to testing/vrisp/40/correct_output.txt diff --git a/vrisp_testing/40/label.txt b/testing/vrisp/40/label.txt similarity index 100% rename from vrisp_testing/40/label.txt rename to testing/vrisp/40/label.txt diff --git a/vrisp_testing/40/network_tool.txt b/testing/vrisp/40/network_tool.txt similarity index 100% rename from vrisp_testing/40/network_tool.txt rename to testing/vrisp/40/network_tool.txt diff --git a/vrisp_testing/40/processor.sh b/testing/vrisp/40/processor.sh similarity index 100% rename from vrisp_testing/40/processor.sh rename to testing/vrisp/40/processor.sh diff --git a/vrisp_testing/40/processor_tool.txt b/testing/vrisp/40/processor_tool.txt similarity index 100% rename from vrisp_testing/40/processor_tool.txt rename to testing/vrisp/40/processor_tool.txt diff --git a/vrisp_testing/41/correct_output.txt b/testing/vrisp/41/correct_output.txt similarity index 100% rename from vrisp_testing/41/correct_output.txt rename to testing/vrisp/41/correct_output.txt diff --git a/vrisp_testing/41/label.txt b/testing/vrisp/41/label.txt similarity index 100% rename from vrisp_testing/41/label.txt rename to testing/vrisp/41/label.txt diff --git a/vrisp_testing/41/network_tool.txt b/testing/vrisp/41/network_tool.txt similarity index 100% rename from vrisp_testing/41/network_tool.txt rename to testing/vrisp/41/network_tool.txt diff --git a/vrisp_testing/41/processor.sh b/testing/vrisp/41/processor.sh similarity index 100% rename from vrisp_testing/41/processor.sh rename to testing/vrisp/41/processor.sh diff --git a/vrisp_testing/41/processor_tool.txt b/testing/vrisp/41/processor_tool.txt similarity index 100% rename from vrisp_testing/41/processor_tool.txt rename to testing/vrisp/41/processor_tool.txt diff --git a/vrisp_testing/42/correct_output.txt b/testing/vrisp/42/correct_output.txt similarity index 100% rename from vrisp_testing/42/correct_output.txt rename to testing/vrisp/42/correct_output.txt diff --git a/vrisp_testing/42/label.txt b/testing/vrisp/42/label.txt similarity index 100% rename from vrisp_testing/42/label.txt rename to testing/vrisp/42/label.txt diff --git a/vrisp_testing/42/network_tool.txt b/testing/vrisp/42/network_tool.txt similarity index 100% rename from vrisp_testing/42/network_tool.txt rename to testing/vrisp/42/network_tool.txt diff --git a/vrisp_testing/42/processor.sh b/testing/vrisp/42/processor.sh similarity index 100% rename from vrisp_testing/42/processor.sh rename to testing/vrisp/42/processor.sh diff --git a/vrisp_testing/42/processor_tool.txt b/testing/vrisp/42/processor_tool.txt similarity index 100% rename from vrisp_testing/42/processor_tool.txt rename to testing/vrisp/42/processor_tool.txt diff --git a/vrisp_testing/43/correct_output.txt b/testing/vrisp/43/correct_output.txt similarity index 100% rename from vrisp_testing/43/correct_output.txt rename to testing/vrisp/43/correct_output.txt diff --git a/vrisp_testing/43/label.txt b/testing/vrisp/43/label.txt similarity index 100% rename from vrisp_testing/43/label.txt rename to testing/vrisp/43/label.txt diff --git a/vrisp_testing/43/network_tool.txt b/testing/vrisp/43/network_tool.txt similarity index 100% rename from vrisp_testing/43/network_tool.txt rename to testing/vrisp/43/network_tool.txt diff --git a/vrisp_testing/43/processor.sh b/testing/vrisp/43/processor.sh similarity index 100% rename from vrisp_testing/43/processor.sh rename to testing/vrisp/43/processor.sh diff --git a/vrisp_testing/43/processor_tool.txt b/testing/vrisp/43/processor_tool.txt similarity index 100% rename from vrisp_testing/43/processor_tool.txt rename to testing/vrisp/43/processor_tool.txt diff --git a/vrisp_testing/44/correct_output.txt b/testing/vrisp/44/correct_output.txt similarity index 100% rename from vrisp_testing/44/correct_output.txt rename to testing/vrisp/44/correct_output.txt diff --git a/vrisp_testing/44/label.txt b/testing/vrisp/44/label.txt similarity index 100% rename from vrisp_testing/44/label.txt rename to testing/vrisp/44/label.txt diff --git a/vrisp_testing/44/network_tool.txt b/testing/vrisp/44/network_tool.txt similarity index 100% rename from vrisp_testing/44/network_tool.txt rename to testing/vrisp/44/network_tool.txt diff --git a/vrisp_testing/44/processor.sh b/testing/vrisp/44/processor.sh similarity index 100% rename from vrisp_testing/44/processor.sh rename to testing/vrisp/44/processor.sh diff --git a/vrisp_testing/44/processor_tool.txt b/testing/vrisp/44/processor_tool.txt similarity index 100% rename from vrisp_testing/44/processor_tool.txt rename to testing/vrisp/44/processor_tool.txt diff --git a/vrisp_testing/45/correct_output.txt b/testing/vrisp/45/correct_output.txt similarity index 100% rename from vrisp_testing/45/correct_output.txt rename to testing/vrisp/45/correct_output.txt diff --git a/vrisp_testing/45/label.txt b/testing/vrisp/45/label.txt similarity index 100% rename from vrisp_testing/45/label.txt rename to testing/vrisp/45/label.txt diff --git a/vrisp_testing/45/network_tool.txt b/testing/vrisp/45/network_tool.txt similarity index 100% rename from vrisp_testing/45/network_tool.txt rename to testing/vrisp/45/network_tool.txt diff --git a/vrisp_testing/45/processor.sh b/testing/vrisp/45/processor.sh similarity index 100% rename from vrisp_testing/45/processor.sh rename to testing/vrisp/45/processor.sh diff --git a/vrisp_testing/45/processor_tool.txt b/testing/vrisp/45/processor_tool.txt similarity index 100% rename from vrisp_testing/45/processor_tool.txt rename to testing/vrisp/45/processor_tool.txt diff --git a/vrisp_testing/46/correct_output.txt b/testing/vrisp/46/correct_output.txt similarity index 100% rename from vrisp_testing/46/correct_output.txt rename to testing/vrisp/46/correct_output.txt diff --git a/vrisp_testing/46/label.txt b/testing/vrisp/46/label.txt similarity index 100% rename from vrisp_testing/46/label.txt rename to testing/vrisp/46/label.txt diff --git a/vrisp_testing/46/network_tool.txt b/testing/vrisp/46/network_tool.txt similarity index 100% rename from vrisp_testing/46/network_tool.txt rename to testing/vrisp/46/network_tool.txt diff --git a/vrisp_testing/46/processor.sh b/testing/vrisp/46/processor.sh similarity index 100% rename from vrisp_testing/46/processor.sh rename to testing/vrisp/46/processor.sh diff --git a/vrisp_testing/46/processor_tool.txt b/testing/vrisp/46/processor_tool.txt similarity index 100% rename from vrisp_testing/46/processor_tool.txt rename to testing/vrisp/46/processor_tool.txt diff --git a/vrisp_testing/47/correct_output.txt b/testing/vrisp/47/correct_output.txt similarity index 100% rename from vrisp_testing/47/correct_output.txt rename to testing/vrisp/47/correct_output.txt diff --git a/vrisp_testing/47/label.txt b/testing/vrisp/47/label.txt similarity index 100% rename from vrisp_testing/47/label.txt rename to testing/vrisp/47/label.txt diff --git a/vrisp_testing/47/network_tool.txt b/testing/vrisp/47/network_tool.txt similarity index 100% rename from vrisp_testing/47/network_tool.txt rename to testing/vrisp/47/network_tool.txt diff --git a/vrisp_testing/47/processor.sh b/testing/vrisp/47/processor.sh similarity index 100% rename from vrisp_testing/47/processor.sh rename to testing/vrisp/47/processor.sh diff --git a/vrisp_testing/47/processor_tool.txt b/testing/vrisp/47/processor_tool.txt similarity index 100% rename from vrisp_testing/47/processor_tool.txt rename to testing/vrisp/47/processor_tool.txt diff --git a/vrisp_testing/48/correct_output.txt b/testing/vrisp/48/correct_output.txt similarity index 100% rename from vrisp_testing/48/correct_output.txt rename to testing/vrisp/48/correct_output.txt diff --git a/vrisp_testing/48/label.txt b/testing/vrisp/48/label.txt similarity index 100% rename from vrisp_testing/48/label.txt rename to testing/vrisp/48/label.txt diff --git a/vrisp_testing/48/network_tool.txt b/testing/vrisp/48/network_tool.txt similarity index 100% rename from vrisp_testing/48/network_tool.txt rename to testing/vrisp/48/network_tool.txt diff --git a/vrisp_testing/48/processor.sh b/testing/vrisp/48/processor.sh similarity index 100% rename from vrisp_testing/48/processor.sh rename to testing/vrisp/48/processor.sh diff --git a/vrisp_testing/48/processor_tool.txt b/testing/vrisp/48/processor_tool.txt similarity index 100% rename from vrisp_testing/48/processor_tool.txt rename to testing/vrisp/48/processor_tool.txt diff --git a/vrisp_testing/49/correct_output.txt b/testing/vrisp/49/correct_output.txt similarity index 100% rename from vrisp_testing/49/correct_output.txt rename to testing/vrisp/49/correct_output.txt diff --git a/vrisp_testing/49/label.txt b/testing/vrisp/49/label.txt similarity index 100% rename from vrisp_testing/49/label.txt rename to testing/vrisp/49/label.txt diff --git a/vrisp_testing/49/network_tool.txt b/testing/vrisp/49/network_tool.txt similarity index 100% rename from vrisp_testing/49/network_tool.txt rename to testing/vrisp/49/network_tool.txt diff --git a/vrisp_testing/49/processor.sh b/testing/vrisp/49/processor.sh similarity index 100% rename from vrisp_testing/49/processor.sh rename to testing/vrisp/49/processor.sh diff --git a/vrisp_testing/49/processor_tool.txt b/testing/vrisp/49/processor_tool.txt similarity index 100% rename from vrisp_testing/49/processor_tool.txt rename to testing/vrisp/49/processor_tool.txt diff --git a/vrisp_testing/50/correct_output.txt b/testing/vrisp/50/correct_output.txt similarity index 100% rename from vrisp_testing/50/correct_output.txt rename to testing/vrisp/50/correct_output.txt diff --git a/vrisp_testing/50/label.txt b/testing/vrisp/50/label.txt similarity index 100% rename from vrisp_testing/50/label.txt rename to testing/vrisp/50/label.txt diff --git a/vrisp_testing/50/network_tool.txt b/testing/vrisp/50/network_tool.txt similarity index 100% rename from vrisp_testing/50/network_tool.txt rename to testing/vrisp/50/network_tool.txt diff --git a/vrisp_testing/50/processor.sh b/testing/vrisp/50/processor.sh similarity index 100% rename from vrisp_testing/50/processor.sh rename to testing/vrisp/50/processor.sh diff --git a/vrisp_testing/50/processor_tool.txt b/testing/vrisp/50/processor_tool.txt similarity index 100% rename from vrisp_testing/50/processor_tool.txt rename to testing/vrisp/50/processor_tool.txt