diff --git a/eqpalg/CMakeLists.txt b/eqpalg/CMakeLists.txt index 69346d8..e0b6980 100644 --- a/eqpalg/CMakeLists.txt +++ b/eqpalg/CMakeLists.txt @@ -103,6 +103,8 @@ add_executable(eqpalg_test ./utility/expression_engine.cpp ./utility/fb_state_machine.cpp ./utility/bound_checker.cpp + ./utility/HoldTime.cc + ./gb_item_memory.cc ) target_include_directories(eqpalg_test PUBLIC diff --git a/eqpalg/algs/exp_bound.cpp b/eqpalg/algs/exp_bound.cpp index 00d2cf2..66e8355 100644 --- a/eqpalg/algs/exp_bound.cpp +++ b/eqpalg/algs/exp_bound.cpp @@ -50,6 +50,10 @@ ExpBound::ExpBound(const string &name, const mix_cc::json &rule_json, ExpBound::~ExpBound() { } +AlarmInfo ExpBound::doMonProc() { + return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc() +} + AlarmInfo ExpBound::mon_proc() { if (expr_engine_->evaluateBool("feedback") == false) { diff --git a/eqpalg/algs/exp_bound.h b/eqpalg/algs/exp_bound.h index 754524e..dabd981 100644 --- a/eqpalg/algs/exp_bound.h +++ b/eqpalg/algs/exp_bound.h @@ -24,6 +24,7 @@ public: virtual ~ExpBound(); public: + AlarmInfo doMonProc() override; int init() override; virtual AlarmInfo mon_proc() override; std::vector exec_task(mix_cc::time_range_t time_range) override; diff --git a/eqpalg/algs/exp_sample2D.cc b/eqpalg/algs/exp_sample2D.cc index 218cd12..5f83af0 100644 --- a/eqpalg/algs/exp_sample2D.cc +++ b/eqpalg/algs/exp_sample2D.cc @@ -22,6 +22,10 @@ ExpSample2D::ExpSample2D(const string &name, const mix_cc::json &rule_json, ExpSample2D::~ExpSample2D() { } +AlarmInfo ExpSample2D::doMonProc() { + return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc() +} + int ExpSample2D::init() { int ret = 0; ret += AlgBase::init(); diff --git a/eqpalg/algs/exp_sample2D.h b/eqpalg/algs/exp_sample2D.h index 074fe63..395665f 100644 --- a/eqpalg/algs/exp_sample2D.h +++ b/eqpalg/algs/exp_sample2D.h @@ -23,6 +23,8 @@ class ExpSample2D : public ExpBase { ~ExpSample2D() override; + AlarmInfo doMonProc() override; + virtual int init() override; /** diff --git a/eqpalg/algs/exp_times.cc b/eqpalg/algs/exp_times.cc index 064f8ae..dcef62a 100644 --- a/eqpalg/algs/exp_times.cc +++ b/eqpalg/algs/exp_times.cc @@ -66,6 +66,10 @@ ExpTimes::~ExpTimes() { this->wait_flag_ = 0; } +AlarmInfo ExpTimes::doMonProc() { + return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc() +} + int ExpTimes::init() { int ret = 0; try { diff --git a/eqpalg/algs/exp_times.h b/eqpalg/algs/exp_times.h index 593e779..fbd55e7 100644 --- a/eqpalg/algs/exp_times.h +++ b/eqpalg/algs/exp_times.h @@ -20,6 +20,7 @@ class ExpTimes : public ExpBase { const string& ruleId, size_t exp_type); ~ExpTimes() override; + AlarmInfo doMonProc() override; virtual AlarmInfo mon_proc() override; virtual int init() override; /** diff --git a/eqpalg/algs/roller2.cpp b/eqpalg/algs/roller2.cpp index 16d3f3e..a9745f1 100644 --- a/eqpalg/algs/roller2.cpp +++ b/eqpalg/algs/roller2.cpp @@ -51,6 +51,10 @@ Roller2::~Roller2() { } +AlarmInfo Roller2::doMonProc() { + return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc() +} + AlarmInfo Roller2::mon_proc() { refresh_var_result(); if (!pre_exp_flag_) { diff --git a/eqpalg/algs/roller2.h b/eqpalg/algs/roller2.h index 28dddda..4ff69e0 100644 --- a/eqpalg/algs/roller2.h +++ b/eqpalg/algs/roller2.h @@ -24,6 +24,7 @@ class Roller2 : public ExpBase { virtual ~Roller2(); public: + AlarmInfo doMonProc() override; const vector ExpStr = {"pre_exp", "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9"}; int init() override; diff --git a/eqpalg/algs/roller3.cpp b/eqpalg/algs/roller3.cpp index 5bb39f5..e370642 100644 --- a/eqpalg/algs/roller3.cpp +++ b/eqpalg/algs/roller3.cpp @@ -69,6 +69,10 @@ Roller3::~Roller3() { } +AlarmInfo Roller3::doMonProc() { + return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc() +} + AlarmInfo Roller3::mon_proc() { if (!expr_engine_->evaluateBool("act")) { diff --git a/eqpalg/algs/roller3.h b/eqpalg/algs/roller3.h index 8d73894..c4edba3 100644 --- a/eqpalg/algs/roller3.h +++ b/eqpalg/algs/roller3.h @@ -36,6 +36,7 @@ public: virtual ~Roller3(); public: + AlarmInfo doMonProc() override; int init() override; virtual AlarmInfo mon_proc() override; std::vector exec_task(mix_cc::time_range_t time_range) override;