Commit baa6fa87 authored by Davis King's avatar Davis King

Just moved some files and #includes around a little.

--HG--
rename : dlib/svm/graph_labeler.h => dlib/graph_cuts/graph_labeler.h
rename : dlib/svm/graph_labeler_abstract.h => dlib/graph_cuts/graph_labeler_abstract.h
parent 3a5f99f4
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
#include "graph_cuts/min_cut.h" #include "graph_cuts/min_cut.h"
#include "graph_cuts/general_flow_graph.h" #include "graph_cuts/general_flow_graph.h"
#include "graph_cuts/find_max_factor_graph_potts.h" #include "graph_cuts/find_max_factor_graph_potts.h"
#include "graph_cuts/graph_labeler.h"
#include "svm/graph_labeler.h"
#include "svm/structural_svm_graph_labeling_problem.h"
#include "svm/structural_graph_labeling_trainer.h"
#include "svm/cross_validate_graph_labeling_trainer.h"
#endif // DLIB_GRAPH_CUTs_HEADER_ #endif // DLIB_GRAPH_CUTs_HEADER_
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include "../matrix.h" #include "../matrix.h"
#include "../string.h" #include "../string.h"
#include <vector> #include <vector>
#include "../graph_cuts.h" #include "find_max_factor_graph_potts.h"
#include "sparse_vector.h" #include "../svm/sparse_vector.h"
#include "../graph.h" #include "../graph.h"
namespace dlib namespace dlib
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#undef DLIB_GRAPH_LaBELER_ABSTRACT_H__ #undef DLIB_GRAPH_LaBELER_ABSTRACT_H__
#ifdef DLIB_GRAPH_LaBELER_ABSTRACT_H__ #ifdef DLIB_GRAPH_LaBELER_ABSTRACT_H__
#include "../graph_cuts/find_max_factor_graph_potts_abstract.h" #include "find_max_factor_graph_potts_abstract.h"
#include "../graph/graph_kernel_abstract.h" #include "../graph/graph_kernel_abstract.h"
#include "../matrix/matrix_abstract.h" #include "../matrix/matrix_abstract.h"
#include <vector> #include <vector>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "../algs.h" #include "../algs.h"
#include "../optimization.h" #include "../optimization.h"
#include "structural_svm_graph_labeling_problem.h" #include "structural_svm_graph_labeling_problem.h"
#include "graph_labeler.h" #include "../graph_cuts/graph_labeler.h"
namespace dlib namespace dlib
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "../algs.h" #include "../algs.h"
#include "../optimization.h" #include "../optimization.h"
#include "structural_svm_graph_labeling_problem_abstract.h" #include "structural_svm_graph_labeling_problem_abstract.h"
#include "graph_labeler_abstract.h" #include "../graph_cuts/graph_labeler_abstract.h"
namespace dlib namespace dlib
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
#include "svm/structural_svm_assignment_problem.h" #include "svm/structural_svm_assignment_problem.h"
#include "svm/structural_assignment_trainer.h" #include "svm/structural_assignment_trainer.h"
#include "svm/structural_svm_graph_labeling_problem.h"
#include "svm/structural_graph_labeling_trainer.h"
#include "svm/cross_validate_graph_labeling_trainer.h"
#endif // DLIB_SVm_THREADED_HEADER #endif // DLIB_SVm_THREADED_HEADER
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#include <dlib/graph_cuts.h> #include <dlib/svm_threaded.h>
#include <dlib/data_io.h> #include <dlib/data_io.h>
#include "tester.h" #include "tester.h"
......
Markdown is supported
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