From baa6fa879d9087df634a49ad136345ff8e7127e2 Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Sun, 6 May 2012 22:35:42 -0400
Subject: [PATCH] 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 +-----
 dlib/{svm => graph_cuts}/graph_labeler.h              | 4 ++--
 dlib/{svm => graph_cuts}/graph_labeler_abstract.h     | 2 +-
 dlib/svm/structural_graph_labeling_trainer.h          | 2 +-
 dlib/svm/structural_graph_labeling_trainer_abstract.h | 2 +-
 dlib/svm_threaded.h                                   | 4 ++++
 dlib/test/graph_labeler.cpp                           | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename dlib/{svm => graph_cuts}/graph_labeler.h (98%)
 rename dlib/{svm => graph_cuts}/graph_labeler_abstract.h (99%)

diff --git a/dlib/graph_cuts.h b/dlib/graph_cuts.h
index 023e2587f..c245b2be4 100644
--- a/dlib/graph_cuts.h
+++ b/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_
 
diff --git a/dlib/svm/graph_labeler.h b/dlib/graph_cuts/graph_labeler.h
similarity index 98%
rename from dlib/svm/graph_labeler.h
rename to dlib/graph_cuts/graph_labeler.h
index 5468d1a89..982b559cb 100644
--- a/dlib/svm/graph_labeler.h
+++ b/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
diff --git a/dlib/svm/graph_labeler_abstract.h b/dlib/graph_cuts/graph_labeler_abstract.h
similarity index 99%
rename from dlib/svm/graph_labeler_abstract.h
rename to dlib/graph_cuts/graph_labeler_abstract.h
index c90e10a49..a37c1caeb 100644
--- a/dlib/svm/graph_labeler_abstract.h
+++ b/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>
diff --git a/dlib/svm/structural_graph_labeling_trainer.h b/dlib/svm/structural_graph_labeling_trainer.h
index c5e5768fe..4a8c59b0c 100644
--- a/dlib/svm/structural_graph_labeling_trainer.h
+++ b/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
diff --git a/dlib/svm/structural_graph_labeling_trainer_abstract.h b/dlib/svm/structural_graph_labeling_trainer_abstract.h
index e52cffbbd..57e2c7101 100644
--- a/dlib/svm/structural_graph_labeling_trainer_abstract.h
+++ b/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
diff --git a/dlib/svm_threaded.h b/dlib/svm_threaded.h
index c3500e463..f911bad9b 100644
--- a/dlib/svm_threaded.h
+++ b/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
 
 
diff --git a/dlib/test/graph_labeler.cpp b/dlib/test/graph_labeler.cpp
index b9eeded3d..23e5a9fe4 100644
--- a/dlib/test/graph_labeler.cpp
+++ b/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"