Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removal of Redundant Features in Libraries #minor #322

Merged
merged 14 commits into from
Oct 13, 2023
Merged

Removal of Redundant Features in Libraries #minor #322

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9b6f130
remove LibV4
anilbey Oct 12, 2023
531b33e
keep only depolarized_base in LibV3
anilbey Oct 12, 2023
185d6c5
remove LibV1::peak_indices
anilbey Oct 12, 2023
ee261b2
remove commented out LibV2 pointers
anilbey Oct 12, 2023
f37cfb8
remove LibV2 E6-E40 features, not used not tested
anilbey Oct 12, 2023
0aea0a3
remove LibV1::spike_width1, use LibV5::spike_half_width
anilbey Oct 12, 2023
b2036e1
remove LibV1::rest_voltage_value, use LibV5::voltage_base
anilbey Oct 13, 2023
82c3550
remove LibV1::min_AHP_values
anilbey Oct 13, 2023
a1abcab
remove LibV1::LibV1::AHP_depth_abs
anilbey Oct 13, 2023
bddc762
remove LibV1::min_AHP_indices, LibV5 is used
anilbey Oct 13, 2023
0d63178
Merge branch 'BlueBrain:master' into removal
anilbey Oct 13, 2023
8ed9e18
test_spikecount_libv5peakindices -> test_setDependencyFileLocation
anilbey Oct 13, 2023
c903c2a
Revert "remove LibV2 E6-E40 features, not used not tested"
anilbey Oct 13, 2023
2a5ce1a
use getDependencyFileLocation in test_setDependencyFileLocation
anilbey Oct 13, 2023
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
29 changes: 0 additions & 29 deletions efel/DependencyV5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,9 @@ LibV2:AP_rise_rate_change #LibV2:AP_rise_rate #LibV1:interpolate
LibV2:AP_fall_rate_change #LibV2:AP_fall_rate #LibV1:interpolate
LibV2:fast_AHP_change #LibV2:fast_AHP #LibV1:interpolate
LibV2:AP_duration_half_width_change #LibV2:AP_duration_half_width #LibV1:interpolate
LibV2:E6 #LibV1:AP_amplitude;APWaveForm #LibV1:interpolate
LibV2:E7 #LibV2:AP_duration;APWaveForm #LibV1:interpolate
LibV1:single_burst_ratio #LibV1:ISI_values #LibV1:interpolate
LibV2:BPAPatt2 #LibV1:peak_voltage;location_soma #LibV5:voltage_base;location #LibV1:interpolate
LibV2:BPAPatt3 #LibV1:peak_voltage;location_soma #LibV5:voltage_base;location #LibV1:interpolate
LibV2:E39 #LibV1:mean_frequency;IDthreshold #LibV1:interpolate
LibV2:E39_cod #LibV2:E39 #LibV1:interpolate
LibV2:E2 #LibV2:amp_drop_first_second;APDrop #LibV1:interpolate
LibV2:E3 #LibV2:amp_drop_first_last;APDrop #LibV1:interpolate
LibV2:E4 #LibV2:amp_drop_second_last;APDrop #LibV1:interpolate
LibV2:E5 #LibV2:max_amp_difference;APDrop #LibV1:interpolate
LibV2:E8 #LibV2:AP_duration_half_width;APWaveForm #LibV1:interpolate
LibV2:E9 #LibV2:AP_rise_time;APWaveForm #LibV1:interpolate
LibV2:E10 #LibV2:AP_fall_time;APWaveForm #LibV1:interpolate
LibV2:E11 #LibV2:AP_rise_rate;APWaveForm #LibV1:interpolate
LibV2:E12 #LibV2:AP_fall_rate;APWaveForm #LibV1:interpolate
LibV2:E13 #LibV2:fast_AHP;APWaveForm #LibV1:interpolate
LibV2:E14 #LibV1:peak_voltage;APWaveForm #LibV1:interpolate
LibV2:E15 #LibV2:AP_duration;APWaveForm #LibV1:interpolate
LibV2:E16 #LibV2:AP_duration_half_width;APWaveForm #LibV1:interpolate
LibV2:E17 #LibV2:AP_rise_time;APWaveForm #LibV1:interpolate
LibV2:E18 #LibV2:AP_fall_time;APWaveForm #LibV1:interpolate
LibV2:E19 #LibV2:AP_rise_rate;APWaveForm #LibV1:interpolate
LibV2:E20 #LibV2:AP_fall_rate;APWaveForm #LibV1:interpolate
LibV2:E21 #LibV2:fast_AHP;APWaveForm #LibV1:interpolate
LibV2:E22 #LibV2:AP_amplitude_change;APWaveForm #LibV1:interpolate
LibV2:E23 #LibV2:AP_duration_change;APWaveForm #LibV1:interpolate
LibV2:E24 #LibV2:AP_duration_half_width_change;APWaveForm #LibV1:interpolate
LibV2:E25 #LibV2:AP_rise_rate_change;APWaveForm #LibV1:interpolate
LibV2:E26 #LibV2:AP_fall_rate_change;APWaveForm #LibV1:interpolate
LibV2:E27 #LibV2:fast_AHP_change;APWaveForm #LibV1:interpolate
LibV2:E40 #LibV1:time_to_first_spike;IDrest #LibV1:interpolate
LibV2:steady_state_hyper #LibV1:interpolate
LibV2:amp_drop_first_second #LibV1:peak_voltage #LibV1:interpolate
LibV2:amp_drop_first_last #LibV1:peak_voltage #LibV1:interpolate
Expand Down
4 changes: 2 additions & 2 deletions efel/cppcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 2.6)

set(CMAKE_BUILD_TYPE Debug)

set(FEATURESRCS Utils.cpp LibV1.cpp LibV2.cpp LibV3.cpp LibV4.cpp LibV5.cpp
set(FEATURESRCS Utils.cpp LibV1.cpp LibV2.cpp LibV3.cpp LibV5.cpp
FillFptrTable.cpp DependencyTree.cpp efel.cpp cfeature.cpp
mapoperations.cpp)

Expand All @@ -33,6 +33,6 @@ add_library(efel SHARED ${FEATURESRCS})
install(TARGETS efel LIBRARY DESTINATION lib)

install(FILES efel.h cfeature.h FillFptrTable.h LibV1.h LibV2.h LibV3.h
LibV4.h LibV5.h mapoperations.h Utils.h DependencyTree.h eFELLogger.h
LibV5.h mapoperations.h Utils.h DependencyTree.h eFELLogger.h
types.h
DESTINATION include)
50 changes: 0 additions & 50 deletions efel/cppcore/FillFptrTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,17 @@
int FillFptrTable() {
//****************** for FptrTableV1 *****************************
FptrTableV1["interpolate"] = &LibV1::interpolate;
FptrTableV1["peak_indices"] = &LibV1::peak_indices;
FptrTableV1["ISI_values"] = &LibV1::ISI_values;
FptrTableV1["peak_voltage"] = &LibV1::peak_voltage;
FptrTableV1["mean_frequency"] = &LibV1::firing_rate;
FptrTableV1["peak_time"] = &LibV1::peak_time;
FptrTableV1["time_to_first_spike"] = &LibV1::first_spike_time;
FptrTableV1["min_AHP_indices"] = &LibV1::min_AHP_indices;
FptrTableV1["min_AHP_values"] = &LibV1::min_AHP_values;
FptrTableV1["voltage_base"] = &LibV1::rest_voltage_value;
FptrTableV1["burst_ISI_indices"] = &LibV1::burst_ISI_indices;
FptrTableV1["adaptation_index"] = &LibV1::adaptation_index;
FptrTableV1["trace_check"] = &LibV1::trace_check;
FptrTableV1["spike_half_width"] = &LibV1::spike_width1;
FptrTableV1["spike_width2"] = &LibV1::spike_width2;
FptrTableV1["burst_mean_freq"] = &LibV1::burst_mean_freq;
FptrTableV1["interburst_voltage"] = &LibV1::interburst_voltage;
FptrTableV1["AHP_depth_abs"] = &LibV1::AHP_depth_abs;
// passive properties
FptrTableV1["time_constant"] = &LibV1::time_constant;
FptrTableV1["voltage_deflection"] = &LibV1::voltage_deflection;
Expand Down Expand Up @@ -65,17 +59,9 @@ int FillFptrTable() {

//****************** for FptrTableV2 *****************************
/*
FptrTableV2["peak_indices"] = &LibV2::peak_indices;
FptrTableV2["ISI_values"] = &LibV2::ISI_values;
FptrTableV2["peak_voltage"] = &LibV2::peak_voltage;
FptrTableV2["firing_rate"] = &LibV2::firing_rate;
FptrTableV2["peak_time"] = &LibV2::peak_time;
FptrTableV2["first_spike_time"] = &LibV2::first_spike_time;
FptrTableV2["AHP_min_indices"] = &LibV2::AHP_min_indices;
FptrTableV2["AHP_values"] = &LibV2::AHP_values;
FptrTableV2["rest_voltage_value"] = &LibV2::rest_voltage_value;
FptrTableV2["burst_vector"] = &LibV2::burst_vector;
FptrTableV2["adaptation_index"] = &LibV2::adaptation_index;
*/

// AP parameter
Expand All @@ -96,38 +82,9 @@ int FillFptrTable() {
FptrTableV2["AP_duration_half_width"] = &LibV2::AP_duration_half_width;
FptrTableV2["AP_duration_half_width_change"] =
&LibV2::AP_duration_half_width_change;
FptrTableV2["E6"] = &LibV2::E6;
FptrTableV2["E7"] = &LibV2::E7;

FptrTableV2["BPAPatt2"] = &LibV2::BPAPatt2;
FptrTableV2["BPAPatt3"] = &LibV2::BPAPatt3;
FptrTableV2["E39"] = &LibV2::E39;
FptrTableV2["E39_cod"] = &LibV2::E39_cod;
FptrTableV2["E2"] = &LibV2::E2;
FptrTableV2["E3"] = &LibV2::E3;
FptrTableV2["E4"] = &LibV2::E4;
FptrTableV2["E5"] = &LibV2::E5;
FptrTableV2["E8"] = &LibV2::E8;
FptrTableV2["E9"] = &LibV2::E9;
FptrTableV2["E10"] = &LibV2::E10;
FptrTableV2["E11"] = &LibV2::E11;
FptrTableV2["E12"] = &LibV2::E12;
FptrTableV2["E13"] = &LibV2::E13;
FptrTableV2["E14"] = &LibV2::E14;
FptrTableV2["E15"] = &LibV2::E15;
FptrTableV2["E16"] = &LibV2::E16;
FptrTableV2["E17"] = &LibV2::E17;
FptrTableV2["E18"] = &LibV2::E18;
FptrTableV2["E19"] = &LibV2::E19;
FptrTableV2["E20"] = &LibV2::E20;
FptrTableV2["E21"] = &LibV2::E21;
FptrTableV2["E22"] = &LibV2::E22;
FptrTableV2["E23"] = &LibV2::E23;
FptrTableV2["E24"] = &LibV2::E24;
FptrTableV2["E25"] = &LibV2::E25;
FptrTableV2["E26"] = &LibV2::E26;
FptrTableV2["E27"] = &LibV2::E27;
FptrTableV2["E40"] = &LibV2::E40;
FptrTableV2["steady_state_hyper"] = &LibV2::steady_state_hyper;
FptrTableV2[string("amp_drop_first_second")] = &LibV2::amp_drop_first_second;
FptrTableV2[string("amp_drop_first_last")] = &LibV2::amp_drop_first_last;
Expand All @@ -137,18 +94,11 @@ int FillFptrTable() {
//****************** end of FptrTableV2 *****************************

//****************** FptrTableV3 *****************************
FptrTableV3["AP_amplitude"] = &LibV3::AP_amplitude;
FptrTableV3["AP_width"] = &LibV3::AP_width;

FptrTableV3["AP_begin_indices"] = &LibV3::AP_begin_indices;
FptrTableV3["AP_end_indices"] = &LibV3::AP_end_indices;
// eFeatures
FptrTableV3["depolarized_base"] = &LibV3::depolarized_base;

//****************** end of FptrTableV3 *****************************

FptrTableV4["peak_indices"] = &LibV4::peak_indices;

//****************** FptrTableV5 *****************************

FptrTableV5["ISI_log_slope"] = &LibV5::ISI_log_slope;
Expand Down
2 changes: 0 additions & 2 deletions efel/cppcore/FillFptrTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@
#include "LibV1.h"
#include "LibV2.h"
#include "LibV3.h"
#include "LibV4.h"
#include "LibV5.h"

extern feature2function FptrTableV1;
extern feature2function FptrTableV2;
extern feature2function FptrTableV3;
extern feature2function FptrTableV4;
extern feature2function FptrTableV5;

int FillFptrTable();
Expand Down
Loading
Loading