Cleanup block_structure.h/cc

1. Remove obsolete Proto conversion functions. 2. Fix a strict weak ordering bug. Change-Id: I1ce6d4b06e29cf475df1d5bd37c79f66f20f8d93
ikoruk · Apr 13, 2014 · 46ccfb3 · 46ccfb3
1 parent 7d489fd
commit 46ccfb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/internal/ceres/block_structure.cc b/internal/ceres/block_structure.cc
@@ -34,6 +34,9 @@ namespace ceres {
 namespace internal {
 
 bool CellLessThan(const Cell& lhs, const Cell& rhs) {
+  if (lhs.block_id == rhs.block_id) {
+    return (lhs.position  < rhs.position);
+  }
   return (lhs.block_id < rhs.block_id);
 }
 

diff --git a/internal/ceres/block_structure.h b/internal/ceres/block_structure.h
@@ -45,8 +45,6 @@
 namespace ceres {
 namespace internal {
 
-class BlockStructureProto;
-
 typedef int32 BlockSize;
 
 struct Block {
@@ -89,16 +87,6 @@ struct CompressedColumnBlockStructure {
   vector<CompressedColumn> cols;
 };
 
-// Deserialize the given block structure proto to the given block structure.
-// Destroys previous contents of block_structure.
-void ProtoToBlockStructure(const BlockStructureProto &proto,
-                           CompressedRowBlockStructure *block_structure);
-
-// Serialize the given block structure to the given proto. Destroys previous
-// contents of proto.
-void BlockStructureToProto(const CompressedRowBlockStructure &block_structure,
-                           BlockStructureProto *proto);
-
 }  // namespace internal
 }  // namespace ceres