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
---
algorithm/include/IndirectAlg.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/algorithm/include/IndirectAlg.h b/algorithm/include/IndirectAlg.h
new file mode 100644
index 0000000..5d9beba
--- /dev/null
+++ b/algorithm/include/IndirectAlg.h
@@ -0,0 +1,52 @@
+#ifndef __USG_INDIRECTALG_H__
+#define __USG_INDIRECTALG_H__
+#include "usg_common.h"
+#include "graph.h"
+struct Record
+{
+ std::string id;
+ time_t timestamp;
+ Point coordinate;
+};
+
+struct Status;
+
+class IndirectAlg {
+
+
+ Figure frame;
+ //閫嗚鎸佺画鏃堕棿锛岃瓒呰繃杩欎釜鏃堕棿鎵嶇畻閫嗚
+ time_t keepTime;
+ // 浠ｈ〃姝ｇ‘琛岃蛋鏂瑰悜鐨勫悜閲�
+ Vector2 direction;
+ // 鐘舵�佺紦瀛�
+ std::map<std::string, Status *> statusMap;
+
+ std::atomic<bool> mterminate;
+ std::thread mthread;
+ void threadRoutine();
+
+public:
+
+ IndirectAlg();
+ IndirectAlg(const std::initializer_list<Edge> & edges, const time_t & _keepTime, const Vector2 & _direction);
+ /**
+ * @points 缁勬垚瑙傛祴鍖哄煙鐨勫郊姝ょ浉閭荤殑鐐�
+ * @_keepTime 淇濇寔鏃堕棿
+ * @_direction 姝ｇ‘琛岃繘鐨勬柟鍚戞柟鍚�
+ */
+ IndirectAlg(const std::initializer_list<Point> & points, const time_t & _keepTime, const Vector2 & _direction);
+
+ ~IndirectAlg();
+
+ void printRecord(int tag, Record &record);
+ /**
+ * 鏄惁閫嗚
+ */
+ bool isRetrograde(Record &record);
+
+
+
+};
+
+#endif
\ No newline at end of file
--
Gitblit v1.8.0