Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
cpp_sisso
Commits
5864c392
Commit
5864c392
authored
Apr 19, 2021
by
Thomas Purcell
Browse files
Correct include formatting
Use "file" when it is considered standard
parent
0d261b9e
Changes
140
Hide whitespace changes
Inline
Side-by-side
src/classification/ConvexHull1D.cpp
View file @
5864c392
#include
<
classification/ConvexHull1D.hpp
>
#include
"
classification/ConvexHull1D.hpp
"
ConvexHull1D
::
ConvexHull1D
()
:
_sorted_value
(),
...
...
src/classification/ConvexHull1D.hpp
View file @
5864c392
...
...
@@ -8,10 +8,12 @@
#ifndef CONVEX_UTILS
#define CONVEX_UTILS
#include
<utils/math_funcs.hpp>
#include
<iomanip>
#include
<coin/ClpSimplex.hpp>
#include
<classification/prop_sorted_d_mat.hpp>
#include
"classification/prop_sorted_d_mat.hpp"
#include
"utils/math_funcs.hpp"
class
ConvexHull1D
{
...
...
src/classification/LPWrapper.cpp
View file @
5864c392
#include
<classification/LPWrapper.hpp>
#include
"classification/LPWrapper.hpp"
LPWrapper
::
LPWrapper
(
std
::
vector
<
int
>
samp_per_class
,
const
int
task_num
,
const
int
n_class
,
const
int
n_dim
,
const
int
n_samp
,
const
double
tol
)
:
_elements
((
n_dim
+
1
)
*
n_samp
,
0.0
),
_row_lower
((
n_dim
+
1
)
*
n_samp
,
1.0
),
...
...
src/classification/LPWrapper.hpp
View file @
5864c392
...
...
@@ -14,8 +14,8 @@
#include
<coin/ClpSimplex.hpp>
#include
<
classification/prop_sorted_d_mat.hpp
>
#include
<
utils/mkl_interface.hpp
>
#include
"
classification/prop_sorted_d_mat.hpp
"
#include
"
utils/mkl_interface.hpp
"
class
LPWrapper
{
protected:
...
...
src/classification/SVMWrapper.cpp
View file @
5864c392
#include
<
classification/SVMWrapper.hpp
>
#include
"
classification/SVMWrapper.hpp
"
SVMWrapper
::
SVMWrapper
(
const
int
n_class
,
const
int
n_dim
,
const
int
n_samp
,
const
double
*
prop
)
:
_model
(
nullptr
),
...
...
src/classification/SVMWrapper.hpp
View file @
5864c392
...
...
@@ -12,8 +12,8 @@
#include
<iostream>
#include
<numeric>
#include
<
classification/prop_sorted_d_mat.hpp
>
#include
<
external/libsvm/svm.h
>
#include
"
classification/prop_sorted_d_mat.hpp
"
#include
"
external/libsvm/svm.h
"
class
SVMWrapper
{
...
...
src/classification/prop_sorted_d_mat.cpp
View file @
5864c392
#include
<
classification/prop_sorted_d_mat.hpp
>
#include
"
classification/prop_sorted_d_mat.hpp
"
std
::
vector
<
double
>
prop_sorted_d_mat
::
SORTED_D_MATRIX
;
...
...
src/classification/prop_sorted_d_mat.hpp
View file @
5864c392
/** @file
<
classification/prop_sorted_d_mat.hp
/** @file classification/prop_sorted_d_mat.hp
p
* @brief Central storage area for a sorted descriptor matrix based on the task/class of a sample
* @author Thomas A. R. Purcell (tpurcell)
...
...
src/descriptor_identifier/Model/Model.cpp
View file @
5864c392
#include
<
descriptor_identifier/Model/Model.hpp
>
#include
"
descriptor_identifier/Model/Model.hpp
"
Model
::
Model
(
const
std
::
string
prop_label
,
...
...
src/descriptor_identifier/Model/Model.hpp
View file @
5864c392
...
...
@@ -14,12 +14,12 @@
#include
<boost/algorithm/string/trim.hpp>
#include
<boost/filesystem.hpp>
#include
<iomanip>
#include
<fstream>
#include
<iostream>
#include
<iomanip>
#include
<fstream>
#include
<iostream>
#include
<
feature_creation/node/ModelNode.hpp
>
#include
<
utils/string_utils.hpp
>
#include
"
feature_creation/node/ModelNode.hpp
"
#include
"
utils/string_utils.hpp
"
#ifdef PY_BINDINGS
namespace
np
=
boost
::
python
::
numpy
;
...
...
src/descriptor_identifier/Model/ModelClassifier.cpp
View file @
5864c392
#include
<
descriptor_identifier/Model/ModelClassifier.hpp
>
#include
"
descriptor_identifier/Model/ModelClassifier.hpp
"
ModelClassifier
::
ModelClassifier
(
const
std
::
string
prop_label
,
...
...
src/descriptor_identifier/Model/ModelClassifier.hpp
View file @
5864c392
...
...
@@ -14,16 +14,16 @@
#include
<boost/algorithm/string/trim.hpp>
#include
<boost/filesystem.hpp>
#include
<iomanip>
#include
<fstream>
#include
<iostream>
#include
<iomanip>
#include
<fstream>
#include
<iostream>
#include
<coin/ClpSimplex.hpp>
#include
<
classification/SVMWrapper.hpp
>
#include
<
descriptor_identifier/Model/Model.hpp
>
#include
<
feature_creation/node/ModelNode.hpp
>
#include
<
utils/string_utils.hpp
>
#include
"
classification/SVMWrapper.hpp
"
#include
"
descriptor_identifier/Model/Model.hpp
"
#include
"
feature_creation/node/ModelNode.hpp
"
#include
"
utils/string_utils.hpp
"
#ifdef PY_BINDINGS
namespace
np
=
boost
::
python
::
numpy
;
...
...
src/descriptor_identifier/Model/ModelLogRegressor.cpp
View file @
5864c392
#include
<
descriptor_identifier/Model/ModelLogRegressor.hpp
>
#include
"
descriptor_identifier/Model/ModelLogRegressor.hpp
"
ModelLogRegressor
::
ModelLogRegressor
()
{}
...
...
src/descriptor_identifier/Model/ModelLogRegressor.hpp
View file @
5864c392
...
...
@@ -10,7 +10,7 @@
#ifndef MODEL_LOG_REGRESSOR
#define MODEL_LOG_REGRESSOR
#include
<
descriptor_identifier/Model/ModelRegressor.hpp
>
#include
"
descriptor_identifier/Model/ModelRegressor.hpp
"
#ifdef PY_BINDINGS
namespace
np
=
boost
::
python
::
numpy
;
...
...
src/descriptor_identifier/Model/ModelRegressor.cpp
View file @
5864c392
#include
<
descriptor_identifier/Model/ModelRegressor.hpp
>
#include
"
descriptor_identifier/Model/ModelRegressor.hpp
"
ModelRegressor
::
ModelRegressor
()
{}
...
...
src/descriptor_identifier/Model/ModelRegressor.hpp
View file @
5864c392
...
...
@@ -18,9 +18,9 @@
#include
<fstream>
#include
<iostream>
#include
<
descriptor_identifier/Model/Model.hpp
>
#include
<
feature_creation/node/ModelNode.hpp
>
#include
<
utils/string_utils.hpp
>
#include
"
descriptor_identifier/Model/Model.hpp
"
#include
"
feature_creation/node/ModelNode.hpp
"
#include
"
utils/string_utils.hpp
"
#ifdef PY_BINDINGS
namespace
np
=
boost
::
python
::
numpy
;
...
...
src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
View file @
5864c392
#include
<
descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
>
#include
"
descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
"
SISSOClassifier
::
SISSOClassifier
(
const
std
::
shared_ptr
<
FeatureSpace
>
feat_space
,
...
...
src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
View file @
5864c392
...
...
@@ -11,12 +11,12 @@
#include
<coin/ClpSimplex.hpp>
#include
<
classification/prop_sorted_d_mat.hpp
>
#include
<
classification/SVMWrapper.hpp
>
#include
<
classification/LPWrapper.hpp
>
#include
<
feature_creation/feature_space/FeatureSpace.hpp
>
#include
<
descriptor_identifier/Model/ModelClassifier.hpp
>
#include
<
descriptor_identifier/SISSO_DI/SISSO_DI.hpp
>
#include
"
classification/prop_sorted_d_mat.hpp
"
#include
"
classification/SVMWrapper.hpp
"
#include
"
classification/LPWrapper.hpp
"
#include
"
feature_creation/feature_space/FeatureSpace.hpp
"
#include
"
descriptor_identifier/Model/ModelClassifier.hpp
"
#include
"
descriptor_identifier/SISSO_DI/SISSO_DI.hpp
"
#include
<ctime>
#include
<iomanip>
...
...
src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
View file @
5864c392
#include
<
descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
>
#include
"
descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
"
SISSOLogRegressor
::
SISSOLogRegressor
(
const
std
::
shared_ptr
<
FeatureSpace
>
feat_space
,
...
...
src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
View file @
5864c392
...
...
@@ -9,8 +9,8 @@
#ifndef SISSO_LOG_REGRESSOR
#define SISSO_LOG_REGRESSOR
#include
<
descriptor_identifier/Model/ModelLogRegressor.hpp
>
#include
<
descriptor_identifier/SISSO_DI/SISSORegressor.hpp
>
#include
"
descriptor_identifier/Model/ModelLogRegressor.hpp
"
#include
"
descriptor_identifier/SISSO_DI/SISSORegressor.hpp
"
#ifdef PY_BINDINGS
namespace
np
=
boost
::
python
::
numpy
;
...
...
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment