File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed
plotters/src/coord/ranged1d/types Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -199,13 +199,12 @@ macro_rules! gen_key_points_comp {
199
199
fn $name( range: ( $type, $type) , max_points: usize ) -> Vec <$type> {
200
200
let mut scale: $type = 1 ;
201
201
let range = ( range. 0 . min( range. 1 ) , range. 0 . max( range. 1 ) ) ;
202
- ' outer: while ( range. 1 - range. 0 + scale - 1 ) as usize / ( scale as usize ) > max_points {
202
+ let range_size = range. 1 as f64 - range. 0 as f64 ;
203
+ ' outer: while ( range_size / scale as f64 ) . ceil( ) > max_points as f64 {
203
204
let next_scale = scale * 10 ;
204
205
for new_scale in [ scale * 2 , scale * 5 , scale * 10 ] . iter( ) {
205
206
scale = * new_scale;
206
- if ( range. 1 - range. 0 + * new_scale - 1 ) as usize / ( * new_scale as usize )
207
- < max_points
208
- {
207
+ if ( range_size / * new_scale as f64 ) . ceil( ) < max_points as f64 {
209
208
break ' outer;
210
209
}
211
210
}
@@ -220,7 +219,11 @@ macro_rules! gen_key_points_comp {
220
219
let mut ret = vec![ ] ;
221
220
while left <= right {
222
221
ret. push( left as $type) ;
223
- left += scale;
222
+ if left < right {
223
+ left += scale;
224
+ } else {
225
+ break ;
226
+ }
224
227
}
225
228
226
229
return ret;
You can’t perform that action at this time.
0 commit comments