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

dlib/graph_cuts.h

@@ -6,11 +6,7 @@
 #include "graph_cuts/min_cut.h"
 #include "graph_cuts/general_flow_graph.h"
 #include "graph_cuts/find_max_factor_graph_potts.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"
+#include "graph_cuts/graph_labeler.h"
 
 #endif // DLIB_GRAPH_CUTs_HEADER_
 

dlib/graph_cuts/graph_labeler.h

@@ -7,8 +7,8 @@
 #include "../matrix.h"
 #include "../string.h"
 #include <vector>
-#include "../graph_cuts.h"
-#include "sparse_vector.h"
+#include "find_max_factor_graph_potts.h"
+#include "../svm/sparse_vector.h"
 #include "../graph.h"
 
 namespace dlib

dlib/graph_cuts/graph_labeler_abstract.h

@@ -3,7 +3,7 @@
 #undef 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 "../matrix/matrix_abstract.h"
 #include <vector>

dlib/svm/structural_graph_labeling_trainer.h

@@ -7,7 +7,7 @@
 #include "../algs.h"
 #include "../optimization.h"
 #include "structural_svm_graph_labeling_problem.h"
-#include "graph_labeler.h"
+#include "../graph_cuts/graph_labeler.h"
 
 
 namespace dlib

dlib/svm/structural_graph_labeling_trainer_abstract.h

@@ -6,7 +6,7 @@
 #include "../algs.h"
 #include "../optimization.h"
 #include "structural_svm_graph_labeling_problem_abstract.h"
-#include "graph_labeler_abstract.h"
+#include "../graph_cuts/graph_labeler_abstract.h"
 
 
 namespace dlib

dlib/svm_threaded.h

@@ -15,6 +15,10 @@
 #include "svm/structural_svm_assignment_problem.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
 
 

dlib/test/graph_labeler.cpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <cstdlib>
 #include <ctime>
-#include <dlib/graph_cuts.h>
+#include <dlib/svm_threaded.h>
 #include <dlib/data_io.h>
 
 #include "tester.h"