From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict
---
test/test_right_walk3.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/test_right_walk3.c b/test/test_right_walk3.c
index 343f8f4..9b97b1c 100644
--- a/test/test_right_walk3.c
+++ b/test/test_right_walk3.c
@@ -94,7 +94,7 @@
void test3() {
- std::ifstream fin("test2.txt");
+ std::ifstream fin("test3.txt");
char line[1024];
//std::string line;
char *targetIdStr;
@@ -105,8 +105,9 @@
char *targetPointXstr;
char *targetPointYstr;
//{"x":148,"y":45},{"x":148,"y":539},{"x":769,"y":539},{"x":769,"y":45}
+ //{148, 45}, {148, 539}, {769, 539}, {769, 45}
Record record;
- IndirectAlg indirectAlg((std::initializer_list<Point>){{148, 45}, {148, 539}, {769, 539}, {769, 45} }, 2, {621, 0});
+ IndirectAlg indirectAlg((std::initializer_list<Point>){}, 3, {621, 0});
// const char *delim = " ";
while(fin.getline(line, 1024)) {
@@ -151,10 +152,12 @@
// printf("key = %s, value=%s\n", key, value);
}
fin.close();
+ sleep(30);
}
int main() {
test3();
+
}
--
Gitblit v1.8.0