Calibrated superstructure again and redid buttons.
Change-Id: Ib3db490c68b628686768796d9d0d5782dc3a0065
diff --git a/y2018/control_loops/superstructure/arm/graph.h b/y2018/control_loops/superstructure/arm/graph.h
index d295cfc..6724eac 100644
--- a/y2018/control_loops/superstructure/arm/graph.h
+++ b/y2018/control_loops/superstructure/arm/graph.h
@@ -136,10 +136,11 @@
SearchGraph(size_t num_vertexes, std::vector<Edge> &&edges);
SearchGraph(size_t num_vertexes, ::std::initializer_list<Edge> edges);
SearchGraph(SearchGraph &&o)
- : goal_vertex_(o.goal_vertex_),
- vertexes_(::std::move(o.vertexes_)),
+ : vertexes_(::std::move(o.vertexes_)),
edges_(::std::move(o.edges_)),
- vertex_heap_(::std::move(o.vertex_heap_)) {}
+ vertex_heap_(::std::move(o.vertex_heap_)) {
+ last_searched_vertex_ = std::numeric_limits<size_t>::max();
+ }
~SearchGraph();
@@ -160,7 +161,6 @@
const std::vector<Edge> &edges() const { return edges_; }
private:
- size_t goal_vertex_ = std::numeric_limits<size_t>::max();
struct Vertex {
std::vector<HalfEdge> forward;
std::vector<HalfEdge> reverse;
@@ -179,7 +179,7 @@
IntrusivePriorityQueue<Vertex> vertex_heap_;
- size_t last_searched_vertex_ = 1;
+ size_t last_searched_vertex_ = std::numeric_limits<size_t>::max();
};
} // namespace arm