mi2-warsaw / FSelectorRcpp

@@ -110,7 +110,7 @@
Loading
110 110
111 111
      _sizeLog = std::log(_size);
112 112
113 -
    };
113 +
    }
114 114
115 115
116 116
    void add_sample(const T& val)
@@ -184,7 +184,7 @@
Loading
184 184
      add_sample(*first);
185 185
      _size++;
186 186
    }
187 -
  };
187 +
  }
188 188
189 189
190 190
  void add_sample(const int& val)

@@ -74,7 +74,7 @@
Loading
74 74
		}
75 75
76 76
		return final_result;
77 -
	};
77 +
	}
78 78
79 79
80 80
	}

@@ -4,8 +4,8 @@
Loading
4 4
#include <R_ext/Rdynload.h>
5 5
6 6
/* FIXME:
7 -
Check these declarations against the C/Fortran source code.
8 -
*/
7 +
 Check these declarations against the C/Fortran source code.
8 +
 */
9 9
10 10
/* .Call calls */
11 11
extern SEXP _FSelectorRcpp_cutOff_k(SEXP, SEXP, SEXP);
@@ -15,8 +15,8 @@
Loading
15 15
extern SEXP _FSelectorRcpp_fs_order(SEXP);
16 16
extern SEXP _FSelectorRcpp_fs_table_numeric2d(SEXP, SEXP);
17 17
extern SEXP _FSelectorRcpp_fs_table1d(SEXP);
18 -
extern SEXP _FSelectorRcpp_information_gain_cpp(SEXP, SEXP, SEXP);
19 -
extern SEXP _FSelectorRcpp_sparse_information_gain_cpp(SEXP, SEXP);
18 +
extern SEXP _FSelectorRcpp_information_gain_cpp(SEXP, SEXP, SEXP, SEXP);
19 +
extern SEXP _FSelectorRcpp_sparse_information_gain_cpp(SEXP, SEXP, SEXP);
20 20
extern void run_testthat_tests();
21 21
22 22
static const R_CallMethodDef CallEntries[] = {

@@ -23,13 +23,16 @@
Loading
23 23
24 24
  switch(method)
25 25
  {
26 -
    case DISCRETIZE_METHOD::MDL:
27 -
      return mdl::discretize(itX, itXLast, itY, itResult);
28 -
      break;
29 -
30 -
    case DISCRETIZE_METHOD::EQUAL_SIZE:
31 -
      std::shared_ptr<equalsize::DiscControlEqualSize> controlEqual = std::static_pointer_cast<equalsize::DiscControlEqualSize>(control);
32 -
      return equalsize::discretize(itX, itXLast, itY, itResult, *controlEqual);
26 +
    case DISCRETIZE_METHOD::MDL: {
27 +
        return mdl::discretize(itX, itXLast, itY, itResult);
28 +
        break;
29 +
    }
30 +
    case DISCRETIZE_METHOD::EQUAL_SIZE: {
31 +
        std::shared_ptr<equalsize::DiscControlEqualSize> controlEqual = std::static_pointer_cast<equalsize::DiscControlEqualSize>(control);
32 +
        return equalsize::discretize(itX, itXLast, itY, itResult, *controlEqual);
33 +
        break;
34 +
    }
35 +
    default:
33 36
      break;
34 37
  }
35 38

@@ -65,6 +65,10 @@
Loading
65 65
        }
66 66
        break;
67 67
      }
68 +
69 +
      default:
70 +
        break;
71 +
68 72
    }
69 73
70 74
    varEntropy[i] = entr;
Files Coverage
R 98.26%
inst/include 96.09%
src 99.42%
Project Totals (21 files) 97.89%
Sunburst
The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.
Icicle
The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.
Grid
Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.
Loading