Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

message(STATUS "cmake version ${CMAKE_VERSION}")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
# cmake > 4.0 does not support projects with minimal versions < 3.5
message(STATUS "Changing cmake minimum version to 3.5 globally")
set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE INTERNAL "")
endif()

include(CMakeDependentOption)
include(third-party)
include(version)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ namespace knp::framework::inference_evaluation::classification
class EvaluationHelper
{
public:
explicit EvaluationHelper(
const knp::framework::data_processing::classification::Dataset &dataset,
std::vector<InferenceResult> &inference_results);
explicit EvaluationHelper(const knp::framework::data_processing::classification::Dataset &dataset);

void process_spikes(const knp::core::messaging::SpikeData &firing_neuron_indices, size_t step);

Expand All @@ -55,14 +53,11 @@ class EvaluationHelper
std::vector<size_t> class_votes_;

const knp::framework::data_processing::classification::Dataset &dataset_;
std::vector<InferenceResult> &inference_results_;
};


EvaluationHelper::EvaluationHelper(
const knp::framework::data_processing::classification::Dataset &dataset,
std::vector<InferenceResult> &inference_results)
: class_votes_(dataset.get_amount_of_classes(), 0), dataset_(dataset), inference_results_(inference_results)
EvaluationHelper::EvaluationHelper(const knp::framework::data_processing::classification::Dataset &dataset)
: class_votes_(dataset.get_amount_of_classes(), 0), dataset_(dataset)
{
}

Expand Down Expand Up @@ -119,7 +114,7 @@ void InferenceResultsProcessor::process_inference_results(
const std::vector<knp::core::messaging::SpikeMessage> &spikes,
knp::framework::data_processing::classification::Dataset const &dataset)
{
EvaluationHelper helper(dataset, inference_results_);
EvaluationHelper helper(dataset);
knp::core::messaging::SpikeData firing_neuron_indices;
auto spikes_iter = spikes.begin();

Expand Down
2 changes: 1 addition & 1 deletion knp/tests/framework/inference_evaluation_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ TEST(InferenceEvaluation, Classification)
ASSERT_EQ(
csv_res.str(),
"CLASS,TOTAL_VOTES,TRUE_POSITIVES,FALSE_NEGATIVES,FALSE_POSITIVES,TRUE_NEGATIVES,PRECISION,RECALL,PREVALENCE,"
"ACCURACY,F_MEASURE\n0,2,1,0,1,2,0.5,0.5,0.25,0.75,0.5\n1,2,2,0,0,2,1,1,0.5,1,1\n");
"ACCURACY,F_SCORE\n0,2,1,0,1,2,0.5,0.5,0.25,0.75,0.5\n1,2,2,0,0,2,1,1,0.5,1,1\n");
}
Loading