Permalink
Browse files

Update Makefile.common

  • Loading branch information...
1 parent b268a23 commit d84e7789a978c2c753b87507292f3b6e1aee1f42 @yunshengb yunshengb committed May 4, 2016
View
@@ -1,16 +1,20 @@
UNDER_TEST=1
-.PHONY: default all test clean
+.PHONY: default all debug test clean
default: all
all: all-sub all-here
+debug: debug-sub debug-here
test: test-sub test-here
clean: clean-sub clean-here
all-sub:
$(foreach var,$(SUBDIRS),$(MAKE) -C $(var) all || exit 1;)
+debug-sub:
+ $(foreach var,$(SUBDIRS),$(MAKE) -C $(var) debug || exit 1;)
+
test-sub:
$(foreach var,$(TESTSUBDIRS),$(MAKE) -C $(var) test || exit 1;)
@@ -7,3 +7,4 @@ gen-**
**/.project
**/.settings/*
**/.classpath
+/Default/
@@ -334,7 +334,7 @@ void build_model(DescriptorMatcher *matcher, vector<string> *trainImgs){
DescriptorExtractor *extractor = new SurfDescriptorExtractor();
// Generate desc
- string db = fs::current_path().parent_path().string() + "/opencv/matching/landmarks/db";
+ string db = fs::current_path().parent_path().string() + "/opencv_imm/opencv/matching/landmarks/db";
fs::path p = fs::system_complete(db);
assert(fs::is_directory(p));
@@ -213,6 +213,7 @@ protected int getMaxResultsPerQuery() {
}
// run an Indri query, returning up to MAX_RESULTS_PERQUERY results
+ System.out.println("@@@@@@@@@@" + transformQueryString(query.getQueryString()));
ScoredExtentResult[] results =
env.runQuery(transformQueryString(query.getQueryString()),
MAX_RESULTS_PERQUERY);

0 comments on commit d84e778

Please sign in to comment.