zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the bug when there are three wave time slices in one eigen interval.

Browse Source
This commit is contained in:
pandx 2025-01-09 11:51:12 +08:00
parent 5fa4e726af
commit 2b08db4aa7
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="446663210403312388" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1102353172776392420" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-469859550318386951" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1102353172776392420" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

2
scheduler/schedule.hpp
View File

@ -142,7 +142,7 @@ private:
int seconds_in_current_eigen_slice_; // 相对特征值发送间隔的秒数 int seconds_in_current_eigen_slice_; // 相对特征值发送间隔的秒数
bool ts_in_eigen_slice_; // 时间位于特征值发送窗口中 bool ts_in_eigen_slice_; // 时间位于特征值发送窗口中
int nth_eigen_slice_; // 如果ts_in_eigen_slice_是真的话，此值表明是第几个特征值窗口 int nth_eigen_slice_; // 如果ts_in_eigen_slice_是真的话，此值表明是第几个特征值窗口
bool nth_wave_slice_; // 如果ts_in_eigen_slice_是假的话，此值表明是第几个波形窗口 int nth_wave_slice_; // 如果ts_in_eigen_slice_是假的话，此值表明是第几个波形窗口
int current_request_; int current_request_;
}; };

32
scheduler/wave_feature_set.cpp
View File

@ -33,12 +33,12 @@ WaveFeatureSetting::WaveFeatureSetting() {
global_feature_.short_addr = 0; global_feature_.short_addr = 0;
for (size_t i = 0; i < v.size(); ++i) { for (size_t i = 0; i < v.size(); ++i) {
if (i == 0) { if (i == 0) {
global_feature_.x = v[i].asInt(); global_feature_.x = v.get(i, 0).asInt();
} else if (i == 1) { } else if (i == 1) {
global_feature_.y = v[i].asInt(); global_feature_.y = v.get(i, 0).asInt();
} else if (i == 2) { } else if (i == 2) {
global_feature_.z = v[i].asInt(); global_feature_.z = v.get(i, 0).asInt();
} }
} }
} else { } else {
short_addr = strtol(key.c_str(), &end_ptr, 16); short_addr = strtol(key.c_str(), &end_ptr, 16);
@ -46,12 +46,12 @@ WaveFeatureSetting::WaveFeatureSetting() {
FeatureEntryPrivateCfg item; FeatureEntryPrivateCfg item;
for (size_t i = 0; i < v.size(); ++i) { for (size_t i = 0; i < v.size(); ++i) {
if (i == 0) { if (i == 0) {
item.x = v[i].asInt(); item.x = v.get(i, 0).asInt();
} else if (i == 1) { } else if (i == 1) {
item.y = v[i].asInt(); item.y = v.get(i, 0).asInt();
} else if (i == 2) { } else if (i == 2) {
item.z = v[i].asInt(); item.z = v.get(i, 0).asInt();
} }
} }
eigen_map_[short_addr] = item; eigen_map_[short_addr] = item;
} }
@ -85,12 +85,12 @@ WaveFeatureSetting::WaveFeatureSetting() {
global_wave_.short_addr = 0; global_wave_.short_addr = 0;
for (size_t i = 0; i < v.size(); ++i) { for (size_t i = 0; i < v.size(); ++i) {
if (i == 0) { if (i == 0) {
global_wave_.x = v[i].asInt(); global_wave_.x = v.get(i, 0).asInt();
} else if (i == 1) { } else if (i == 1) {
global_wave_.y = v[i].asInt(); global_wave_.y = v.get(i, 0).asInt();
} else if (i == 2) { } else if (i == 2) {
global_wave_.z = v[i].asInt(); global_wave_.z = v.get(i, 0).asInt();
} }
} }
} else { } else {
short_addr = strtol(key.c_str(), &end_ptr, 16); short_addr = strtol(key.c_str(), &end_ptr, 16);
@ -98,12 +98,12 @@ WaveFeatureSetting::WaveFeatureSetting() {
FeatureEntryPrivateCfg item; FeatureEntryPrivateCfg item;
for (size_t i = 0; i < v.size(); ++i) { for (size_t i = 0; i < v.size(); ++i) {
if (i == 0) { if (i == 0) {
item.x = v[i].asInt(); item.x = v.get(i, 0).asInt();
} else if (i == 1) { } else if (i == 1) {
item.y = v[i].asInt(); item.y = v.get(i, 0).asInt();
} else if (i == 2) { } else if (i == 2) {
item.z = v[i].asInt(); item.z = v.get(i, 0).asInt();
} }
} }
wave_map_[short_addr] = item; wave_map_[short_addr] = item;