diff options
Diffstat (limited to 'extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc')
-rw-r--r-- | extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc index 2f032e6580a..9bbab4b2377 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc +++ b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc @@ -61,7 +61,7 @@ class CanonicalViewsClustering { // vertices may not be assigned to any cluster. In this case they // are assigned to a cluster with id = kInvalidClusterId. void ComputeClustering(const CanonicalViewsClusteringOptions& options, - const Graph<int>& graph, + const WeightedGraph<int>& graph, vector<int>* centers, IntMap* membership); @@ -74,7 +74,7 @@ class CanonicalViewsClustering { IntMap* membership) const; CanonicalViewsClusteringOptions options_; - const Graph<int>* graph_; + const WeightedGraph<int>* graph_; // Maps a view to its representative canonical view (its cluster // center). IntMap view_to_canonical_view_; @@ -85,7 +85,7 @@ class CanonicalViewsClustering { void ComputeCanonicalViewsClustering( const CanonicalViewsClusteringOptions& options, - const Graph<int>& graph, + const WeightedGraph<int>& graph, vector<int>* centers, IntMap* membership) { time_t start_time = time(NULL); @@ -98,7 +98,7 @@ void ComputeCanonicalViewsClustering( // Implementation of CanonicalViewsClustering void CanonicalViewsClustering::ComputeClustering( const CanonicalViewsClusteringOptions& options, - const Graph<int>& graph, + const WeightedGraph<int>& graph, vector<int>* centers, IntMap* membership) { options_ = options; @@ -150,7 +150,7 @@ void CanonicalViewsClustering::FindValidViews( for (IntSet::const_iterator view = views.begin(); view != views.end(); ++view) { - if (graph_->VertexWeight(*view) != Graph<int>::InvalidWeight()) { + if (graph_->VertexWeight(*view) != WeightedGraph<int>::InvalidWeight()) { valid_views->insert(*view); } } |