Commit 4f119ed6 authored by Davis King's avatar Davis King

Moved the edge list graph tools out of the manifold_regularization folder

and into graph_utils.

--HG--
rename : dlib/manifold_regularization/graph_creation.h => dlib/graph_utils/edge_list_graphs.h
rename : dlib/manifold_regularization/graph_creation_abstract.h => dlib/graph_utils/edge_list_graphs_abstract.h
rename : dlib/manifold_regularization/ordered_sample_pair.h => dlib/graph_utils/ordered_sample_pair.h
rename : dlib/manifold_regularization/ordered_sample_pair_abstract.h => dlib/graph_utils/ordered_sample_pair_abstract.h
rename : dlib/manifold_regularization/sample_pair.h => dlib/graph_utils/sample_pair.h
rename : dlib/manifold_regularization/sample_pair_abstract.h => dlib/graph_utils/sample_pair_abstract.h
parent 76925a3c
......@@ -6,7 +6,7 @@
#include "chinese_whispers_abstract.h"
#include <vector>
#include "../rand.h"
#include "../manifold_regularization/graph_creation.h"
#include "../graph_utils/edge_list_graphs.h"
namespace dlib
{
......
......@@ -5,8 +5,8 @@
#include <vector>
#include "../rand.h"
#include "../manifold_regularization/ordered_sample_pair_abstract.h"
#include "../manifold_regularization/sample_pair_abstract.h"
#include "../graph_utils/ordered_sample_pair_abstract.h"
#include "../graph_utils/sample_pair_abstract.h"
namespace dlib
{
......
......@@ -5,7 +5,7 @@
#include "modularity_clustering_abstract.h"
#include "../sparse_vector.h"
#include "../manifold_regularization/graph_creation.h"
#include "../graph_utils/edge_list_graphs.h"
#include "../matrix.h"
#include "../rand.h"
......
......@@ -4,8 +4,8 @@
#ifdef DLIB_MODULARITY_ClUSTERING_ABSTRACT_H__
#include <vector>
#include "../manifold_regularization/ordered_sample_pair_abstract.h"
#include "../manifold_regularization/sample_pair_abstract.h"
#include "../graph_utils/ordered_sample_pair_abstract.h"
#include "../graph_utils/sample_pair_abstract.h"
namespace dlib
{
......
......@@ -4,6 +4,7 @@
#define DLIB_GRAPH_UTILs_H_
#include "graph_utils/graph_utils.h"
#include "graph_utils/edge_list_graphs.h"
#endif // DLIB_GRAPH_UTILs_H_
......
// Copyright (C) 2010 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license.
#ifndef DLIB_GRAPH_CrEATION_H__
#define DLIB_GRAPH_CrEATION_H__
#ifndef DLIB_EDGE_LIST_GrAPHS_H__
#define DLIB_EDGE_LIST_GrAPHS_H__
#include "graph_creation_abstract.h"
#include "edge_list_graphs_abstract.h"
#include <limits>
#include <vector>
#include "../string.h"
......@@ -588,6 +588,6 @@ namespace dlib
}
#endif // DLIB_GRAPH_CrEATION_H__
#endif // DLIB_EDGE_LIST_GrAPHS_H__
// Copyright (C) 2010 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license.
#undef DLIB_GRAPH_CrEATION_ABSTRACT_H__
#ifdef DLIB_GRAPH_CrEATION_ABSTRACT_H__
#undef DLIB_EDGE_LIST_GrAPHS_ABSTRACT_H__
#ifdef DLIB_EDGE_LIST_GrAPHS_ABSTRACT_H__
#include <vector>
#include "../string.h"
#include "sample_pair_abstract.h"
#include "ordered_sample_pair_abstract.h"
namespace dlib
{
......@@ -352,5 +353,5 @@ namespace dlib
}
#endif // DLIB_GRAPH_CrEATION_ABSTRACT_H__
#endif // DLIB_EDGE_LIST_GrAPHS_ABSTRACT_H__
......@@ -3,10 +3,9 @@
#ifndef DLIB_MANIFOLD_REGULARIzATION_HEADER
#define DLIB_MANIFOLD_REGULARIzATION_HEADER
#include "manifold_regularization/graph_creation.h"
#include "graph_utils/edge_list_graphs.h"
#include "manifold_regularization/linear_manifold_regularizer.h"
#include "manifold_regularization/function_objects.h"
#include "manifold_regularization/sample_pair.h"
#endif // DLIB_MANIFOLD_REGULARIzATION_HEADER
......
......@@ -9,7 +9,7 @@
#include "../algs.h"
#include <vector>
#include <map>
#include "../manifold_regularization/graph_creation.h"
#include "../graph_utils/edge_list_graphs.h"
#include "../matrix.h"
......
......@@ -9,8 +9,8 @@
#include "../matrix.h"
#include <map>
#include <vector>
#include "../manifold_regularization/sample_pair_abstract.h"
#include "../manifold_regularization/ordered_sample_pair_abstract.h"
#include "../graph_utils/sample_pair_abstract.h"
#include "../graph_utils/ordered_sample_pair_abstract.h"
namespace dlib
{
......
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