Test wip

wg-perception · Jun 23, 2012 · eaf64a2 · eaf64a2
1 parent fc235d7
commit eaf64a2
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 21 deletions.
diff --git a/contrib/blender/create_patches.sh b/contrib/blender/create_patches.sh
diff --git a/cpplint b/cpplint
diff --git a/src/libmv/correspondence/planar_tracker.cc b/src/libmv/correspondence/planar_tracker.cc
diff --git a/src/libmv/correspondence/planar_tracker.h b/src/libmv/correspondence/planar_tracker.h
diff --git a/src/libmv/correspondence/robust_tracker.cc b/src/libmv/correspondence/robust_tracker.cc
diff --git a/src/libmv/correspondence/robust_tracker.h b/src/libmv/correspondence/robust_tracker.h
diff --git a/src/libmv/correspondence/tracker.cc b/src/libmv/correspondence/tracker.cc
diff --git a/src/libmv/descriptor/descriptor_factory.cc b/src/libmv/descriptor/descriptor_factory.cc
diff --git a/src/libmv/descriptor/descriptor_factory.h b/src/libmv/descriptor/descriptor_factory.h
diff --git a/src/libmv/detector/detector_factory.cc b/src/libmv/detector/detector_factory.cc
diff --git a/src/libmv/detector/detector_factory.h b/src/libmv/detector/detector_factory.h
diff --git a/src/libmv_opencv/mvr/CMakeLists.txt b/src/libmv_opencv/mvr/CMakeLists.txt
@@ -9,7 +9,7 @@ FILE(GLOB MVR_HDRS *.h)
 
 ADD_LIBRARY(mvr ${MVR_SRC} ${MVR_HDRS})
 
-TARGET_LINK_LIBRARIES(mvr multiview glog numeric V3D ${OpenCV_LIBS})
+TARGET_LINK_LIBRARIES(mvr correspondence multiview glog numeric V3D ${OpenCV_LIBS})
 
 # make the name of debug libraries end in _d.
 SET_TARGET_PROPERTIES(mvr PROPERTIES DEBUG_POSTFIX "_d")

diff --git a/src/libmv_opencv/mvr/mvr_test.cc b/src/libmv_opencv/mvr/mvr_test.cc
@@ -46,7 +46,9 @@ using namespace cv;
 using namespace std;
 
 using namespace libmv;
+using namespace Eigen;
 using namespace cv;
+
 //using namespace libmv_opencv;
 TEST(Mvr, TestYAML) {
 //	{ //write
@@ -101,6 +103,7 @@ TEST(Mvr, TestYAML) {
 
 		// libmv api
 
+		// Matching pts
 		Matches matches;
 		for (int v = 0; v < nviews; ++v) {
 			for (int p = 0; p < npts; ++p) {
@@ -109,26 +112,18 @@ TEST(Mvr, TestYAML) {
 				matches.Insert(v, p, feature);
 			}
 		}
-//		cv::Mat K1 = Mat_<double>::eye(3, 3);
-//		cv::Mat K2 = Mat_<double>::eye(3, 3);
-//		libmv::vector<Mat3> K1_libmv, K2_libmv;
-//
-////		K1_libmv=Matrix::Identitiy<double>(3,3);
-//		for(int r=0;r<3;++r)
-//			for(int c=0;c<3;++c)
-//				K1_libmv(r,c)=0.0;
-//		K1_libmv(0,0)=1.0;
-//		K1_libmv(1,1)=1.0;
-//		K1_libmv(2,2)=1.0;
-//
-//
-//		// Set this from data
-//		Vec2u image_size1(1, 1);
-//		Vec2u image_size2(1.0, 1.0);
-//
-//		Reconstruction recons;
-//		InitialReconstructionTwoViews(matches, 0, 1, K1_libmv, K1_libmv,
-//				image_size1, image_size2, &recons);
+
+		// Camera matrices
+		Eigen::MatrixXf K1_libmv = Eigen::MatrixXf::Identity(3, 3);
+		Eigen::MatrixXf K2_libmv = Eigen::MatrixXf::Identity(3, 3);
+
+		// Image size -- has probs
+		Vec2u image_size1;
+		image_size1 << 1, 1;
+
+		Reconstruction recons;
+		InitialReconstructionTwoViews(matches, 0, 1, K1_libmv, K1_libmv,
+				image_size1, image_size1, &recons);
 
 	}
 }

diff --git a/src/third_party/glog/src/demangle_unittest.sh b/src/third_party/glog/src/demangle_unittest.sh
diff --git a/src/third_party/glog/src/logging_striplog_test.sh b/src/third_party/glog/src/logging_striplog_test.sh
diff --git a/src/third_party/glog/src/signalhandler_unittest.sh b/src/third_party/glog/src/signalhandler_unittest.sh
diff --git a/src/third_party/glog/src/windows/preprocess.sh b/src/third_party/glog/src/windows/preprocess.sh