Commit 5864c392 authored by Thomas Purcell's avatar Thomas Purcell
Browse files

Correct include formatting

Use "file" when it is considered standard
parent 0d261b9e
#include <classification/ConvexHull1D.hpp>
#include "classification/ConvexHull1D.hpp"
ConvexHull1D::ConvexHull1D() :
_sorted_value(),
......
......@@ -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
{
......
#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),
......
......@@ -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:
......
#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),
......
......@@ -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
{
......
#include <classification/prop_sorted_d_mat.hpp>
#include "classification/prop_sorted_d_mat.hpp"
std::vector<double> prop_sorted_d_mat::SORTED_D_MATRIX;
......
/** @file <classification/prop_sorted_d_mat.hp
/** @file classification/prop_sorted_d_mat.hpp
* @brief Central storage area for a sorted descriptor matrix based on the task/class of a sample
* @author Thomas A. R. Purcell (tpurcell)
......
#include <descriptor_identifier/Model/Model.hpp>
#include "descriptor_identifier/Model/Model.hpp"
Model::Model(
const std::string prop_label,
......
......@@ -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;
......
#include <descriptor_identifier/Model/ModelClassifier.hpp>
#include "descriptor_identifier/Model/ModelClassifier.hpp"
ModelClassifier::ModelClassifier(
const std::string prop_label,
......
......@@ -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;
......
#include <descriptor_identifier/Model/ModelLogRegressor.hpp>
#include "descriptor_identifier/Model/ModelLogRegressor.hpp"
ModelLogRegressor::ModelLogRegressor()
{}
......
......@@ -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;
......
#include <descriptor_identifier/Model/ModelRegressor.hpp>
#include "descriptor_identifier/Model/ModelRegressor.hpp"
ModelRegressor::ModelRegressor()
{}
......
......@@ -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;
......
#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
SISSOClassifier::SISSOClassifier(
const std::shared_ptr<FeatureSpace> feat_space,
......
......@@ -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>
......
#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
SISSOLogRegressor::SISSOLogRegressor(
const std::shared_ptr<FeatureSpace> feat_space,
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment