瀏覽代碼

fix algo update

zhuyf 2 年之前
父節點
當前提交
f3e08f7d7e
共有 3 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      Makefile.am
  2. 1 0
      card_base.h
  3. 1 1
      db/db_card.cpp

+ 1 - 1
Makefile.am

@@ -31,7 +31,7 @@ SRC_MAIN= ant.cpp area.cpp base64.cpp bindmorecard.cpp mine_business.cpp card_ar
 
 AM_SOURCES=$(SRC_MONKEYCAR) $(SRC_MODULE_SERVICE) $(SRC_SYNCTIME_MODULE) $(SRC_MAIN) $(SRC_MAIN_EVENT)
 
-AM_CPPFLAGS=-Wall -pthread -m64 -g -std=c++11 -I${prefix}/include -I${prefix}/include/mysql -Iwebsocket -Iwebsocket/sio -Idb  -Imodule_service -Isync_time -I${prefix}/include/eigen3
+AM_CPPFLAGS=-fopenmp -Wall -pthread -m64 -g -std=c++11 -I${prefix}/include -I/usr/local/include/mysql -Iwebsocket -Iwebsocket/sio -I./db  -Imodule_service -I./sync_time -I/usr/local/include/eigen3
 
 AM_LDFLAGS=-Wall -pthread -m64 -g -std=c++11  -L${prefix}/lib
 

+ 1 - 0
card_base.h

@@ -121,6 +121,7 @@ struct card_location_base:card,std::enable_shared_from_this<card_location_base>
     int m_buff_size             = 0;
     float m_pdoa_diff           = 100.0;    // pdoa分站当前上传相位差
     float m_last_pdoa_diff = 100.0;             // pdoa 分站上一帧数据的相位差
+	std::deque<double> deqInput;
     boost::circular_buffer<float> m_cb_pdoa;    // the list of current pdoa's different of phase;
     boost::circular_buffer<float> m_cb_tof;     // the list of tof that is pdoa history value
     boost::circular_buffer<point> m_cb_point;

+ 1 - 1
db/db_card.cpp

@@ -133,7 +133,7 @@ namespace db_card
         }
 
 		return map;*/
-		std::string sql = "SELECT ve.vehicle_id, ve.card_id, ve.dept_id, c.card_type_id, cf.freq_value, v.vehicle_type_id, v.bigger_car_flag \
+		std::string sql = "SELECT ve.vehicle_id, ve.card_id, ve.dept_id, c.card_type_id, cf.freq_value, v.vehicle_type_id \
 		                            FROM dat_vehicle_extend ve \
 									LEFT JOIN dat_vehicle v ON ve.vehicle_id = v.vehicle_id \
 									LEFT JOIN dat_card c ON ve.card_id = c.card_id \