finetune

CMakeLists.txt

@@ -14,7 +14,8 @@ AUX_SOURCE_DIRECTORY(src DIR_SRCS)
 AUX_SOURCE_DIRECTORY(include DIR_INCLUDE)
 
 # 生成可执行文件
-add_executable(SingularityJudger main.cpp ${DIR_SRCS} ${DIR_INCLUDE})
+add_executable(SingularityJudger main.cpp ${DIR_SRCS} ${DIR_INCLUDE}
+        include/alg.h)
 
 # 生成静态库
 #set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

include/utils.h

@@ -13,5 +13,4 @@ namespace utils {
         void restart();
         void end() const;
     };
-
 }

main.cpp

@@ -193,7 +193,11 @@ int main() {
 
     ifstream fin;
 //    fin.open(R"(intersectTest\singularCase3\surfaces.txt)");
-    fin.open(R"(intersectTest\casea3\surfaces.txt)");
+    fin.open(R"(E:\Proj\SingularityJudger\intersectTest\casea3\surfaces.txt)");
+    if (!fin.is_open()) {
+        cout << "file not found" << endl;
+        return 0;
+    }
 
     string str;
     string tmp;

src/SingularityJudger.cpp

@@ -17,7 +17,7 @@ bool SingularityJudger::judge(pair<int, int> focusRange_u1, pair<int, int> focus
     }
     // TODO loop detection to retain patch pair that must have loop or singular intersection
     LoopDetector loopDetector(mesh1.evaluation, mesh2.evaluation, mesh1.tangent_u, mesh2.tangent_u, mesh1.tangent_v,
-                              mesh2.tangent_v, mesh1.normal, mesh2.normal, srf1);
+                              mesh2.tangent_v, mesh1.normal, mesh2.normal, srf1, srf2);
     loopDetector.detect(focusRange_u1, focusRange_v1, focusRange_u2, focusRange_v2);
     judgeRes = vector<vector<char> >(loopDetector.s_subPatchEdgeSampleCnt_u - 1,
                                      vector<char>(loopDetector.s_subPatchEdgeSampleCnt_v - 1, 0));