summaryrefslogtreecommitdiffstats
path: root/src/data_conversion.rs
diff options
context:
space:
mode:
authorClementTsang <cjhtsang@uwaterloo.ca>2020-02-03 00:06:54 -0500
committerClementTsang <cjhtsang@uwaterloo.ca>2020-02-03 00:06:54 -0500
commit7bf88dffd1cc9145b43be8ee0e3ef562d35e9311 (patch)
treee9b82651a25901392e61a190adc8bd61e0e7761a /src/data_conversion.rs
parent0a13d75415e45f2c71b87c4771c5f59790a98d19 (diff)
Fixed network chart to make it a bit more like before my changes
Diffstat (limited to 'src/data_conversion.rs')
-rw-r--r--src/data_conversion.rs36
1 files changed, 4 insertions, 32 deletions
diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index 15234c11..9c211292 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -259,44 +259,16 @@ pub fn convert_network_data_points(
//Insert joiner points
for &(joiner_offset, joiner_val) in &data.rx_data.1 {
let offset_time = time_from_start - joiner_offset as f64;
- rx.push((
- offset_time,
- if joiner_val > 0.0 {
- (joiner_val).log(2.0)
- } else {
- 0.0
- },
- ));
+ rx.push((offset_time, joiner_val));
}
for &(joiner_offset, joiner_val) in &data.tx_data.1 {
let offset_time = time_from_start - joiner_offset as f64;
- tx.push((
- offset_time,
- if joiner_val > 0.0 {
- (joiner_val).log(2.0)
- } else {
- 0.0
- },
- ));
+ tx.push((offset_time, joiner_val));
}
- rx.push((
- time_from_start,
- if data.rx_data.0 > 0.0 {
- (data.rx_data.0).log(2.0)
- } else {
- 0.0
- },
- ));
- tx.push((
- time_from_start,
- if data.rx_data.0 > 0.0 {
- (data.rx_data.0).log(2.0)
- } else {
- 0.0
- },
- ));
+ rx.push((time_from_start, data.rx_data.0));
+ tx.push((time_from_start, data.rx_data.0));
}
let total_rx_converted_result: (f64, String);