From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yew-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id D302B1FF195
for <inbox@lore.proxmox.com>; Fri, 30 May 2025 14:22:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D1FAA2E806;
Fri, 30 May 2025 14:22:36 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: yew-devel@lists.proxmox.com
Date: Fri, 30 May 2025 14:21:48 +0200
Message-Id: <20250530122202.2779300-7-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250530122202.2779300-1-d.csapak@proxmox.com>
References: <20250530122202.2779300-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [yew-devel] [PATCH yew-comp 06/20] rrd: units: simplify
calculations for get_grid_unit_base
X-BeenThere: yew-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Yew framework devel list at Proxmox <yew-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/yew-devel>,
<mailto:yew-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/yew-devel/>
List-Post: <mailto:yew-devel@lists.proxmox.com>
List-Help: <mailto:yew-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/yew-devel>,
<mailto:yew-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Yew framework devel list at Proxmox <yew-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: yew-devel-bounces@lists.proxmox.com
Sender: "yew-devel" <yew-devel-bounces@lists.proxmox.com>
in get_grid_unit_base2, when resolving the mathematical calculations,
one can see that we always subtract 2 from the log2 to get to the
result. (with the exception of ranges smaller than 2 and very big
numbers where the floating point operation does not work properly
anymore in 64 bits, e.g. 2.0^1024 -> Infinity). This saves us the loop
and at least 2 calculations for the condition.
The second condition could never be reached, since doubling a number <
4.0 can never be > 15.0, so we can just remove it.
In get_grid_unit_base10, we can at least change the while loop to an if,
since that will only ever run once.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/rrd/units.rs | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/rrd/units.rs b/src/rrd/units.rs
index ad72565..a15eb2d 100644
--- a/src/rrd/units.rs
+++ b/src/rrd/units.rs
@@ -10,7 +10,7 @@ pub(crate) fn get_grid_unit_base10(min: f64, max: f64) -> f64 {
let mut l = range.log10() as i32;
// the count can be between 1 and 10
- while (range / 10.0_f64.powi(l)) < 2.0 {
+ if (range / 10.0_f64.powi(l)) < 2.0 {
l -= 1;
}
@@ -39,21 +39,13 @@ pub(crate) fn get_grid_unit_base2(min: f64, max: f64) -> f64 {
panic!("get_grid_unit_base2: got zero or negative range - internal error");
}
- let mut l = range.log2() as i32;
+ let mut l = range.log2() as i32 - 2;
- while (range / 2.0_f64.powi(l)) < 4.0 {
+ if range / 2.0_f64.powi(l) < 4.0 {
l -= 1;
}
- let mut res = 2.0_f64.powi(l);
-
- let count = range / res;
-
- if count > 15.0 {
- res *= 2.0;
- }
-
- res
+ 2.0_f64.powi(l)
}
pub(crate) fn get_time_grid_unit(min: i64, max: i64) -> i64 {
--
2.39.5
_______________________________________________
yew-devel mailing list
yew-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/yew-devel