Merge pull request #190 from fasiondog/feature/analysis

fixed SignalBase clone 缺失成员；清理 serialization 头文件包含
fasiondog · Mar 8, 2024 · efb2bc1 · efb2bc1
2 parents 61ec0d0 + acb8cd1
commit efb2bc1
Show file tree

Hide file tree

Showing 30 changed files with 36 additions and 332 deletions.
diff --git a/hikyuu_cpp/hikyuu/DataType.h b/hikyuu_cpp/hikyuu/DataType.h
@@ -37,6 +37,38 @@
 #include "utilities/arithmetic.h"
 #include "utilities/SpendTimer.h"
 
+#if HKU_SUPPORT_SERIALIZATION
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/split_free.hpp>
+#include <boost/serialization/shared_ptr.hpp>
+#include <boost/serialization/assume_abstract.hpp>
+#include <boost/serialization/base_object.hpp>
+#include <boost/serialization/string.hpp>
+#include <boost/serialization/vector.hpp>
+#include <boost/serialization/list.hpp>
+#include <boost/serialization/map.hpp>
+#include <boost/serialization/unordered_map.hpp>
+#include <boost/serialization/set.hpp>
+#include <boost/serialization/unordered_set.hpp>
+
+#if HKU_SUPPORT_XML_ARCHIVE
+#include <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#endif /* HKU_SUPPORT_XML_ARCHIVE */
+
+#if HKU_SUPPORT_TEXT_ARCHIVE
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
+#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
+
+#if HKU_SUPPORT_BINARY_ARCHIVE
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
+
+#include <boost/serialization/export.hpp>
+#endif /* HKU_SUPPORT_SERIALIZATION */
+
 #if defined(_MSC_VER)
 #pragma warning(disable : 4251)
 #pragma warning(disable : 4290)

diff --git a/hikyuu_cpp/hikyuu/indicator/IndicatorImp.h b/hikyuu_cpp/hikyuu/indicator/IndicatorImp.h
@@ -14,35 +14,6 @@
 #include "../utilities/Parameter.h"
 #include "../utilities/thread/StealThreadPool.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#endif /* HKU_SUPPORT_XML_ARCHIVE */
-
-#if HKU_SUPPORT_TEXT_ARCHIVE
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
-
-#if HKU_SUPPORT_BINARY_ARCHIVE
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
-
-#include <boost/serialization/map.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/base_object.hpp>
-
-// linux 下，PriceList_serialization 始终无法特化（及时拷贝到本文件内也一样），取消引用
-// #if HKU_SUPPORT_XML_ARCHIVE || HKU_SUPPORT_TEXT_ARCHIVE
-// #include "../serialization/PriceList_serialization.h"
-// #endif
-#endif /* HKU_SUPPORT_SERIALIZATION */
-
 namespace hku {
 
 #define MAX_RESULT_NUM 6

diff --git a/hikyuu_cpp/hikyuu/serialization/KQuery_serialization.h b/hikyuu_cpp/hikyuu/serialization/KQuery_serialization.h
@@ -13,9 +13,6 @@
 #include "../config.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/base_object.hpp>
 
 namespace boost {
 namespace serialization {
@@ -41,7 +38,7 @@ void save(Archive& ar, const hku::KQuery& query, unsigned int version) {
         ar& BOOST_SERIALIZATION_NVP(start);
         ar& BOOST_SERIALIZATION_NVP(end);
     } else {
-        //非法忽略
+        // 非法忽略
     }
 }
 
@@ -68,7 +65,7 @@ void load(Archive& ar, hku::KQuery& query, unsigned int version) {
         query =
           hku::KQueryByDate(hku::Datetime(start), hku::Datetime(end), enmu_ktype, enum_recover);
     } else {
-        //非法忽略
+        // 非法忽略
     }
 }
 

diff --git a/hikyuu_cpp/hikyuu/serialization/KRecord_serialization.h b/hikyuu_cpp/hikyuu/serialization/KRecord_serialization.h
@@ -13,9 +13,6 @@
 #include "../KRecord.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/MarketInfo_serialization.h b/hikyuu_cpp/hikyuu/serialization/MarketInfo_serialization.h
@@ -13,9 +13,6 @@
 #include "../MarketInfo.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 #include "TimeDelta_serialization.h"
 
 namespace boost {

diff --git a/hikyuu_cpp/hikyuu/serialization/PriceList_serialization.h b/hikyuu_cpp/hikyuu/serialization/PriceList_serialization.h
@@ -14,8 +14,6 @@
 
 #if HKU_SUPPORT_SERIALIZATION
 #if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/StockTypeInfo_serialization.h b/hikyuu_cpp/hikyuu/serialization/StockTypeInfo_serialization.h
@@ -13,8 +13,6 @@
 #include "../StockTypeInfo.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/StockWeight_serialization.h b/hikyuu_cpp/hikyuu/serialization/StockWeight_serialization.h
@@ -13,9 +13,6 @@
 #include "../StockWeight.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/Stock_serialization.h b/hikyuu_cpp/hikyuu/serialization/Stock_serialization.h
@@ -18,9 +18,6 @@
 // TODO 实现非StockManager管理的Stock的序列化
 //===========================================================================
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/TimeLineRecord_serialization.h b/hikyuu_cpp/hikyuu/serialization/TimeLineRecord_serialization.h
@@ -13,9 +13,6 @@
 #include "../TimeLineRecord.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/serialization/TransRecord_serialization.h b/hikyuu_cpp/hikyuu/serialization/TransRecord_serialization.h
@@ -13,9 +13,6 @@
 #include "../TransRecord.h"
 
 #if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/vector.hpp>
 
 namespace boost {
 namespace serialization {

diff --git a/hikyuu_cpp/hikyuu/trade_manage/BorrowRecord.h b/hikyuu_cpp/hikyuu/trade_manage/BorrowRecord.h
@@ -13,10 +13,6 @@
 #include "../serialization/Stock_serialization.h"
 #include "../serialization/Datetime_serialization.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/list.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/CostRecord.h b/hikyuu_cpp/hikyuu/trade_manage/CostRecord.h
@@ -12,10 +12,6 @@
 #include "../DataType.h"
 #include "../config.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/FundsRecord.h b/hikyuu_cpp/hikyuu/trade_manage/FundsRecord.h
@@ -12,10 +12,6 @@
 #include "../DataType.h"
 #include "../config.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/LoanRecord.h b/hikyuu_cpp/hikyuu/trade_manage/LoanRecord.h
@@ -12,12 +12,6 @@
 #include "../DataType.h"
 #include "../config.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/split_member.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/PositionRecord.h b/hikyuu_cpp/hikyuu/trade_manage/PositionRecord.h
@@ -12,10 +12,6 @@
 #include "../StockManager.h"
 #include "../serialization/Stock_serialization.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/split_member.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/TradeCostBase.h b/hikyuu_cpp/hikyuu/trade_manage/TradeCostBase.h
@@ -13,29 +13,6 @@
 #include "../utilities/Parameter.h"
 #include "CostRecord.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/base_object.hpp>
-
-#if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#endif /* HKU_SUPPORT_XML_ARCHIVE */
-
-#if HKU_SUPPORT_TEXT_ARCHIVE
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
-
-#if HKU_SUPPORT_BINARY_ARCHIVE
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
-
-#include <boost/serialization/export.hpp>
-#endif /* HKU_SUPPORT_SERIALIZATION */
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/TradeManager.h b/hikyuu_cpp/hikyuu/trade_manage/TradeManager.h
@@ -19,12 +19,6 @@
 #include "OrderBrokerBase.h"
 #include "crt/TC_Zero.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/map.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/list.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_manage/TradeManagerBase.h b/hikyuu_cpp/hikyuu/trade_manage/TradeManagerBase.h
@@ -17,11 +17,6 @@
 #include "OrderBrokerBase.h"
 #include "crt/TC_Zero.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_free.hpp>
-#endif
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_sys/allocatefunds/AllocateFundsBase.h b/hikyuu_cpp/hikyuu/trade_sys/allocatefunds/AllocateFundsBase.h
@@ -12,29 +12,6 @@
 #include "../../utilities/Parameter.h"
 #include "../allocatefunds/SystemWeight.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/base_object.hpp>
-
-#if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#endif /* HKU_SUPPORT_XML_ARCHIVE */
-
-#if HKU_SUPPORT_TEXT_ARCHIVE
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
-
-#if HKU_SUPPORT_BINARY_ARCHIVE
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
-
-#include <boost/serialization/export.hpp>
-#endif /* HKU_SUPPORT_SERIALIZATION */
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_sys/condition/ConditionBase.h b/hikyuu_cpp/hikyuu/trade_sys/condition/ConditionBase.h
@@ -9,36 +9,11 @@
 #ifndef CONDITIONBASE_H_
 #define CONDITIONBASE_H_
 
-#include <set>
 #include "../../utilities/Parameter.h"
 #include "../../KData.h"
 #include "../../trade_manage/TradeManager.h"
 #include "../signal/SignalBase.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/set.hpp>
-
-#if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#endif /* HKU_SUPPORT_XML_ARCHIVE */
-
-#if HKU_SUPPORT_TEXT_ARCHIVE
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
-
-#if HKU_SUPPORT_BINARY_ARCHIVE
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
-
-#include <boost/serialization/export.hpp>
-#endif /* HKU_SUPPORT_SERIALIZATION */
-
 namespace hku {
 
 /**

diff --git a/hikyuu_cpp/hikyuu/trade_sys/environment/EnvironmentBase.h b/hikyuu_cpp/hikyuu/trade_sys/environment/EnvironmentBase.h
@@ -14,32 +14,6 @@
 #include "../../KQuery.h"
 #include "../../utilities/Parameter.h"
 
-#if HKU_SUPPORT_SERIALIZATION
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/set.hpp>
-#include "../../serialization/Datetime_serialization.h"
-#include "../../serialization/KQuery_serialization.h"
-
-#if HKU_SUPPORT_XML_ARCHIVE
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#endif /* HKU_SUPPORT_XML_ARCHIVE */
-
-#if HKU_SUPPORT_TEXT_ARCHIVE
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#endif /* HKU_SUPPORT_TEXT_ARCHIVE */
-
-#if HKU_SUPPORT_BINARY_ARCHIVE
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#endif /* HKU_SUPPORT_BINARY_ARCHIVE */
-
-#include <boost/serialization/export.hpp>
-#endif /* HKU_SUPPORT_SERIALIZATION */
-
 namespace hku {
 
 /**