Mirror/brk
1
0
Fork 0
mirror of https://github.com/bitcoinresearchkit/brk.git synced 2026-04-25 07:09:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

parser: fix gnericmap multi_insert_simple_average

Browse Source
This commit is contained in:
k
2024-11-20 11:42:06 +01:00
parent d01ea13de4
commit cfae483d9d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -49,10 +49,11 @@
- Added config print at the start of the program - Added config print at the start of the program
- Compressed `empty_address_data` struct to save space (should shave of between up to 50% of the `address_index_to_empty_address_data` database) - Compressed `empty_address_data` struct to save space (should shave of between up to 50% of the `address_index_to_empty_address_data` database)
- Doubled the number of `txid_to_tx_data` databases from 4096 to 8192 - Doubled the number of `txid_to_tx_data` databases from 4096 to 8192
- Added `--recompute_computed true` argument, to allow recomputation of computed datasets in case of a bug - ~Added `--recompute_computed true` argument, to allow recomputation of computed datasets in case of a bug~ Buggy for now
- Fixed not saved arguments, not being processed properly - Fixed not saved arguments, not being processed properly
- Fixed bug in `generic_map.multi_insert_simple_average` - Fixed bug in `generic_map.multi_insert_simple_average`
- Added defragmentation option `--first-defragment true` of databases to save space (which can save up to 50%) - Added defragmentation option `--first-defragment true` of databases to save space (which can save up to 50%)
- Fixed bug in the computation of averages in `GenericMap`
## Server ## Server

14
parser/src/structs/generic_map.rs
View File

@@ -691,7 +691,7 @@ where
let mut average = None; let mut average = None;
keys.iter().for_each(|key| { keys.iter().for_each(|key| {
let previous_average: f32 = average let mut previous_average: f32 = average
.unwrap_or_else(|| { .unwrap_or_else(|| {
key.checked_sub(1) key.checked_sub(1)
.and_then(|previous_average_key| self.get_or_import(&previous_average_key)) .and_then(|previous_average_key| self.get_or_import(&previous_average_key))
@@ -699,6 +699,10 @@ where
}) })
.into(); .into();
if previous_average.is_nan() {
previous_average = 0.0;
}
let mut last_value = f32::lossy_from(source.get_or_import(key).unwrap_or_else(|| { let mut last_value = f32::lossy_from(source.get_or_import(key).unwrap_or_else(|| {
dbg!(key); dbg!(key);
panic!() panic!()
@@ -708,7 +712,13 @@ where
last_value = 0.0; last_value = 0.0;
} }
average.replace(((previous_average * (len - 1.0) + last_value) / len).into()); let _average = (previous_average * (len - 1.0) + last_value) / len;
if _average.is_nan() || _average.is_infinite() {
average.replace(0.0.into());
} else {
average.replace(_average.into());
}
self.insert_computed(*key, average.unwrap()); self.insert_computed(*key, average.unwrap());
}); });