Skip to content

Commit f6ee843

Browse files
committed
replace xx_feature by feature_understanding
1 parent 1b39272 commit f6ee843

35 files changed

+787
-1333
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/*

CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,21 @@ if (${CMAKE_GENERATOR} MATCHES "^Visual Studio")
8585
target_link_libraries(${NAME} mdt_core ssvm boost_system boost_filesystem boost_serialization mpi boost_mpi)
8686
endfunction(FEATURE_EXECUTE)
8787
FEATURE_EXECUTE(clean_element)
88-
FEATURE_EXECUTE(cor_feature)
8988
FEATURE_EXECUTE(count_feature)
9089
FEATURE_EXECUTE(extract_dimension)
9190
FEATURE_EXECUTE(extract_instance_number)
9291
FEATURE_EXECUTE(extract_label_info)
9392
FEATURE_EXECUTE(extract_target_info)
9493
FEATURE_EXECUTE(libsvm_separate_target_sparse)
95-
FEATURE_EXECUTE(mean_feature)
9694
FEATURE_EXECUTE(merge_element_to_colume_sparse)
97-
FEATURE_EXECUTE(min_max_feature)
9895
FEATURE_EXECUTE(mrmr_feature)
9996
FEATURE_EXECUTE(orange_to_libsvm)
10097
FEATURE_EXECUTE(sample_split)
10198
FEATURE_EXECUTE(sax_feature)
10299
FEATURE_EXECUTE(sparse_separate_pos_neg)
103100
FEATURE_EXECUTE(split_by_row)
104101
FEATURE_EXECUTE(split_row_sparse_to_element)
105-
FEATURE_EXECUTE(squared_sum_feature)
106-
FEATURE_EXECUTE(std_feature)
102+
FEATURE_EXECUTE(feature_understanding)
107103

108104
# desvm setting
109105
function(DESVM_EXECUTE NAME)

build/test/example.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\std_feature . g1_5.X feature 20 g1_5.y
4949
"C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\cor_feature . g1_5.X feature 20 g1_5.y
5050
REM "C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\sax_feature . g1_5.X feature 20 g1_5.y 2
51-
"C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\mRMR_feature . g1_5.X feature 20 g1_5.y 1
51+
"C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\mrmr_feature . g1_5.X feature 20 g1_5.y 1
52+
"C:\Program Files (x86)\MPICH2\bin\mpiexec" -n 4 ..\vc\Release\feature_understanding . g1_5.X feature 20 g1_5.y min max mean std cor
5253

5354
..\vc\Release\split_by_row . g1_5.X train 24 g1_5.y
5455
..\vc\Release\split_by_row . g1_5.y train 24 g1_5.y

build/xcode/Makefile

-218
This file was deleted.

desvm/desvc_test.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "../mdt_core/count_line.hpp"
22
#include "../mdt_core/in_range.hpp"
3-
#include "../mdt_core/file_open.hpp"
43

54
#include "../ssvm/LinearSSVC.hpp"
65
#include "../ssvm/RBFRSVC.hpp"
@@ -165,8 +164,7 @@ int main(int argc, char *argv[]) {
165164
total_negative_number += negative_number;
166165
total_negative_error += negative_error;
167166
}
168-
ofstream ofs;
169-
file_open(output, ofstream::out | ofstream::binary | ofstream::app, &ofs);
167+
ofstream ofs(output, ofstream::out | ofstream::binary | ofstream::app);
170168
ofs << "model : " << model << endl;
171169
ofs << "positive_error : " << total_positive_error << endl;
172170
ofs << "positive_number : " << total_positive_number << endl;

desvm/desvr_test.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ int main(int argc, char *argv[]) {
155155
total_instance_number += y.rows();
156156
total_squared_error += (y - result).squaredNorm();
157157
}
158-
ofstream ofs;
159-
file_open(output, ofstream::out | ofstream::binary | ofstream::app, &ofs);
158+
ofstream ofs(output, ofstream::out | ofstream::binary | ofstream::app);
160159
ofs << "model : " << model << endl;
161160
ofs << "total_instance_number : " << total_instance_number << endl;
162161
ofs << "root mean squared error : " << sqrt(total_squared_error / total_instance_number) << endl;

0 commit comments

Comments
 (0)