fix: 子类实现 doMonProc() + 测试 CMake 添加缺失链接文件
This commit is contained in:
parent
62a2e5568b
commit
18a5675109
@ -103,6 +103,8 @@ add_executable(eqpalg_test
|
|||||||
./utility/expression_engine.cpp
|
./utility/expression_engine.cpp
|
||||||
./utility/fb_state_machine.cpp
|
./utility/fb_state_machine.cpp
|
||||||
./utility/bound_checker.cpp
|
./utility/bound_checker.cpp
|
||||||
|
./utility/HoldTime.cc
|
||||||
|
./gb_item_memory.cc
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(eqpalg_test PUBLIC
|
target_include_directories(eqpalg_test PUBLIC
|
||||||
|
|||||||
@ -50,6 +50,10 @@ ExpBound::ExpBound(const string &name, const mix_cc::json &rule_json,
|
|||||||
ExpBound::~ExpBound() {
|
ExpBound::~ExpBound() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AlarmInfo ExpBound::doMonProc() {
|
||||||
|
return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc()
|
||||||
|
}
|
||||||
|
|
||||||
AlarmInfo ExpBound::mon_proc() {
|
AlarmInfo ExpBound::mon_proc() {
|
||||||
|
|
||||||
if (expr_engine_->evaluateBool("feedback") == false) {
|
if (expr_engine_->evaluateBool("feedback") == false) {
|
||||||
|
|||||||
@ -24,6 +24,7 @@ public:
|
|||||||
virtual ~ExpBound();
|
virtual ~ExpBound();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
AlarmInfo doMonProc() override;
|
||||||
int init() override;
|
int init() override;
|
||||||
virtual AlarmInfo mon_proc() override;
|
virtual AlarmInfo mon_proc() override;
|
||||||
std::vector<AlarmInfo> exec_task(mix_cc::time_range_t time_range) override;
|
std::vector<AlarmInfo> exec_task(mix_cc::time_range_t time_range) override;
|
||||||
|
|||||||
@ -22,6 +22,10 @@ ExpSample2D::ExpSample2D(const string &name, const mix_cc::json &rule_json,
|
|||||||
ExpSample2D::~ExpSample2D() {
|
ExpSample2D::~ExpSample2D() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AlarmInfo ExpSample2D::doMonProc() {
|
||||||
|
return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc()
|
||||||
|
}
|
||||||
|
|
||||||
int ExpSample2D::init() {
|
int ExpSample2D::init() {
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
ret += AlgBase::init();
|
ret += AlgBase::init();
|
||||||
|
|||||||
@ -23,6 +23,8 @@ class ExpSample2D : public ExpBase {
|
|||||||
|
|
||||||
~ExpSample2D() override;
|
~ExpSample2D() override;
|
||||||
|
|
||||||
|
AlarmInfo doMonProc() override;
|
||||||
|
|
||||||
virtual int init() override;
|
virtual int init() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -66,6 +66,10 @@ ExpTimes::~ExpTimes() {
|
|||||||
this->wait_flag_ = 0;
|
this->wait_flag_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AlarmInfo ExpTimes::doMonProc() {
|
||||||
|
return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc()
|
||||||
|
}
|
||||||
|
|
||||||
int ExpTimes::init() {
|
int ExpTimes::init() {
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -20,6 +20,7 @@ class ExpTimes : public ExpBase {
|
|||||||
const string& ruleId, size_t exp_type);
|
const string& ruleId, size_t exp_type);
|
||||||
|
|
||||||
~ExpTimes() override;
|
~ExpTimes() override;
|
||||||
|
AlarmInfo doMonProc() override;
|
||||||
virtual AlarmInfo mon_proc() override;
|
virtual AlarmInfo mon_proc() override;
|
||||||
virtual int init() override;
|
virtual int init() override;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -51,6 +51,10 @@ Roller2::~Roller2() {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AlarmInfo Roller2::doMonProc() {
|
||||||
|
return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc()
|
||||||
|
}
|
||||||
|
|
||||||
AlarmInfo Roller2::mon_proc() {
|
AlarmInfo Roller2::mon_proc() {
|
||||||
refresh_var_result();
|
refresh_var_result();
|
||||||
if (!pre_exp_flag_) {
|
if (!pre_exp_flag_) {
|
||||||
|
|||||||
@ -24,6 +24,7 @@ class Roller2 : public ExpBase {
|
|||||||
virtual ~Roller2();
|
virtual ~Roller2();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
AlarmInfo doMonProc() override;
|
||||||
const vector<string> ExpStr = {"pre_exp", "X1", "X2", "X3", "X4",
|
const vector<string> ExpStr = {"pre_exp", "X1", "X2", "X3", "X4",
|
||||||
"X5", "X6", "X7", "X8", "X9"};
|
"X5", "X6", "X7", "X8", "X9"};
|
||||||
int init() override;
|
int init() override;
|
||||||
|
|||||||
@ -69,6 +69,10 @@ Roller3::~Roller3() {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AlarmInfo Roller3::doMonProc() {
|
||||||
|
return AlarmInfo{}; // 此类重写 mon_proc(),不使用 doMonProc()
|
||||||
|
}
|
||||||
|
|
||||||
AlarmInfo Roller3::mon_proc() {
|
AlarmInfo Roller3::mon_proc() {
|
||||||
|
|
||||||
if (!expr_engine_->evaluateBool("act")) {
|
if (!expr_engine_->evaluateBool("act")) {
|
||||||
|
|||||||
@ -36,6 +36,7 @@ public:
|
|||||||
virtual ~Roller3();
|
virtual ~Roller3();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
AlarmInfo doMonProc() override;
|
||||||
int init() override;
|
int init() override;
|
||||||
virtual AlarmInfo mon_proc() override;
|
virtual AlarmInfo mon_proc() override;
|
||||||
std::vector<AlarmInfo> exec_task(mix_cc::time_range_t time_range) override;
|
std::vector<AlarmInfo> exec_task(mix_cc::time_range_t time_range) override;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user