rust/fpnum/src/lib.rs
author unC0Rr
Thu, 19 Dec 2024 12:40:48 +0100
branchtransitional_engine
changeset 16079 624b74443b53
parent 15860 c910381d1ea9
child 16081 6633961698ad
permissions -rw-r--r--
Make FPNum use saturating calculations
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
     1
use std::{cmp, ops};
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
     2
use saturate::SaturatingInto;
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
     3
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     4
const POSITIVE_MASK: u64 = 0x0000_0000_0000_0000;
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     5
const NEGATIVE_MASK: u64 = 0xFFFF_FFFF_FFFF_FFFF;
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     6
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     7
#[inline]
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     8
fn bool_mask(is_negative: bool) -> u64 {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
     9
    if is_negative {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    10
        NEGATIVE_MASK
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    11
    } else {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    12
        POSITIVE_MASK
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    13
    }
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    14
}
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    15
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    16
#[derive(Clone, Debug, Copy)]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    17
pub struct FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    18
    sign_mask: u64,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    19
    value: u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    20
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    21
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    22
impl FPNum {
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
    23
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
    24
    pub fn new(numerator: i32, denominator: u32) -> Self {
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    25
        FPNum::from(numerator) / denominator
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    26
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    27
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    28
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
    29
    pub fn signum(&self) -> i8 {
15234
517f3a1dd5c2 reduce convertions in signum
alfadur
parents: 15233
diff changeset
    30
        (1u64 ^ self.sign_mask).wrapping_sub(self.sign_mask) as i8
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    31
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    32
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    33
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    34
    pub const fn is_negative(&self) -> bool {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    35
        self.sign_mask != POSITIVE_MASK
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    36
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    37
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    38
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    39
    pub const fn is_positive(&self) -> bool {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    40
        self.sign_mask == POSITIVE_MASK
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    41
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    42
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    43
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    44
    pub const fn is_zero(&self) -> bool {
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    45
        self.value == 0
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    46
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    47
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    48
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    49
    pub const fn abs(&self) -> Self {
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    50
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    51
            sign_mask: POSITIVE_MASK,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    52
            value: self.value,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    53
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    54
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    55
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    56
    #[inline]
14160
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14143
diff changeset
    57
    pub fn round(&self) -> i32 {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    58
        ((self.value >> 32) as i32 ^ self.sign_mask as i32).wrapping_sub(self.sign_mask as i32)
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    59
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    60
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
    61
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    62
    pub const fn abs_round(&self) -> u32 {
14102
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13960
diff changeset
    63
        (self.value >> 32) as u32
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13960
diff changeset
    64
    }
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13960
diff changeset
    65
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13960
diff changeset
    66
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
    67
    pub fn sqr(&self) -> Self {
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    68
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    69
            sign_mask: 0,
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
    70
            value: ((self.value as u128).pow(2) >> 32).saturating_into(),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    71
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    72
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    73
15239
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
    74
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
    75
    pub fn sqrt(&self) -> Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    76
        debug_assert!(self.is_positive());
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    77
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    78
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    79
            sign_mask: POSITIVE_MASK,
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
    80
            value: integral_sqrt(self.value) << 16,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    81
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    82
    }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
    83
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
    84
    #[inline]
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    85
    pub fn with_sign(&self, is_negative: bool) -> FPNum {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
    86
        FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    87
            sign_mask: bool_mask(is_negative),
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
    88
            ..*self
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
    89
        }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
    90
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
    91
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
    92
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
    93
    pub const fn with_sign_as(self, other: FPNum) -> FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    94
        FPNum {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    95
            sign_mask: other.sign_mask,
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    96
            ..self
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
    97
        }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
    98
    }
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
    99
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   100
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
   101
    pub const fn point(self) -> FPPoint {
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   102
        FPPoint::new(self, self)
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   103
    }
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   104
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   105
    #[inline]
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   106
    const fn temp_i128(self) -> i128 {
15233
293250953317 fix u32 conversion sign
alfadur
parents: 15232
diff changeset
   107
        ((self.value ^ self.sign_mask) as i128).wrapping_sub(self.sign_mask as i128)
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   108
    }
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   109
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   110
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   111
impl From<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   112
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   113
    fn from(n: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   114
        FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   115
            sign_mask: bool_mask(n < 0),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   116
            value: (n.abs() as u64) << 32,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   117
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   118
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   119
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   120
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   121
impl From<u32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   122
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   123
    fn from(n: u32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   124
        Self {
15233
293250953317 fix u32 conversion sign
alfadur
parents: 15232
diff changeset
   125
            sign_mask: POSITIVE_MASK,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   126
            value: (n as u64) << 32,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   127
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   128
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   129
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   130
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   131
impl From<FPNum> for f64 {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   132
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   133
    fn from(n: FPNum) -> Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   134
        if n.is_negative() {
15240
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15239
diff changeset
   135
            n.value as f64 / -0x1_0000_0000i64 as f64
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   136
        } else {
15240
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15239
diff changeset
   137
            n.value as f64 / 0x1_0000_0000i64 as f64
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   138
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   139
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   140
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   141
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   142
impl PartialEq for FPNum {
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
   143
    #[inline]
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   144
    fn eq(&self, other: &Self) -> bool {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   145
        self.value == other.value && (self.sign_mask == other.sign_mask || self.value == 0)
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   146
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   147
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   148
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   149
impl Eq for FPNum {}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   150
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   151
impl PartialOrd for FPNum {
13909
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13908
diff changeset
   152
    #[inline]
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   153
    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   154
        Some(self.cmp(rhs))
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   155
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   156
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   157
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   158
impl Ord for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   159
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   160
    fn cmp(&self, rhs: &Self) -> cmp::Ordering {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   161
        self.temp_i128().cmp(&(rhs.temp_i128()))
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   162
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   163
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   164
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   165
impl ops::Add for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   166
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   167
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   168
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   169
    fn add(self, rhs: Self) -> Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   170
        let tmp = self.temp_i128() + rhs.temp_i128();
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   171
        let mask = bool_mask(tmp < 0);
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   172
        Self {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   173
            sign_mask: mask,
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   174
            value: ((tmp as u64) ^ mask).wrapping_sub(mask),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   175
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   176
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   177
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   178
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   179
impl ops::Sub for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   180
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   181
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   182
    #[inline]
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   183
    fn sub(self, mut rhs: Self) -> Self {
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   184
        rhs.sign_mask = !rhs.sign_mask;
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   185
        self + rhs
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   186
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   187
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   188
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   189
impl ops::Neg for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   190
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   191
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   192
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   193
    fn neg(self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   194
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   195
            sign_mask: !self.sign_mask,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   196
            value: self.value,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   197
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   198
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   199
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   200
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   201
impl ops::Mul for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   202
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   203
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   204
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   205
    fn mul(self, rhs: Self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   206
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   207
            sign_mask: self.sign_mask ^ rhs.sign_mask,
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   208
            value: ((self.value as u128 * rhs.value as u128) >> 32).saturating_into(),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   209
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   210
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   211
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   212
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   213
impl ops::Mul<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   214
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   215
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   216
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   217
    fn mul(self, rhs: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   218
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   219
            sign_mask: self.sign_mask ^ bool_mask(rhs < 0),
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   220
            value: (self.value as u128 * rhs.abs() as u128).saturating_into(),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   221
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   222
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   223
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   224
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   225
impl ops::Div for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   226
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   227
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   228
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   229
    fn div(self, rhs: Self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   230
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   231
            sign_mask: self.sign_mask ^ rhs.sign_mask,
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   232
            value: (((self.value as u128) << 32) / rhs.value as u128).saturating_into(),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   233
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   234
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   235
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   236
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   237
impl ops::Div<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   238
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   239
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   240
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   241
    fn div(self, rhs: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   242
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   243
            sign_mask: self.sign_mask ^ bool_mask(rhs < 0),
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   244
            value: self.value / rhs.abs() as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   245
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   246
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   247
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   248
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   249
impl ops::Div<u32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   250
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   251
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   252
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   253
    fn div(self, rhs: u32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   254
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   255
            sign_mask: self.sign_mask,
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   256
            value: self.value / rhs as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   257
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   258
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   259
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   260
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   261
#[macro_export]
13911
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   262
macro_rules! fp {
14722
5e2c892b0222 allow fp! take denominator tokens
alfadur
parents: 14688
diff changeset
   263
    ($n: literal / $d: tt) => {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   264
        FPNum::new($n, $d)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   265
    };
14685
def1b9870078 match literals in fp macro
alfadur
parents: 14648
diff changeset
   266
    ($n: literal) => {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   267
        FPNum::from($n)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   268
    };
13911
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   269
}
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   270
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   271
const LINEARIZE_TRESHOLD: u64 = 0x1_0000;
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   272
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   273
#[derive(Clone, Copy, Debug)]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   274
pub struct FPPoint {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   275
    x_sign_mask: u32,
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   276
    y_sign_mask: u32,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   277
    x_value: u64,
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   278
    y_value: u64,
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   279
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   280
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   281
impl FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   282
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
   283
    pub const fn new(x: FPNum, y: FPNum) -> Self {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   284
        Self {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   285
            x_sign_mask: x.sign_mask as u32,
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   286
            y_sign_mask: y.sign_mask as u32,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   287
            x_value: x.value,
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   288
            y_value: y.value,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   289
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   290
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   291
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   292
    #[inline]
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   293
    pub fn zero() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   294
        FPPoint::new(fp!(0), fp!(0))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   295
    }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   296
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   297
    #[inline]
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   298
    pub fn unit_x() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   299
        FPPoint::new(fp!(1), fp!(0))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   300
    }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   301
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   302
    #[inline]
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   303
    pub fn unit_y() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   304
        FPPoint::new(fp!(0), fp!(1))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   305
    }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   306
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   307
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
   308
    pub const fn x(&self) -> FPNum {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   309
        FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   310
            sign_mask: self.x_sign_mask as i32 as u64,
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   311
            value: self.x_value,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   312
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   313
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   314
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   315
    #[inline]
14648
2e2b31cf0871 make stuff const
alfadur
parents: 14228
diff changeset
   316
    pub const fn y(&self) -> FPNum {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   317
        FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   318
            sign_mask: self.y_sign_mask as i32 as u64,
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   319
            value: self.y_value,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   320
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   321
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   322
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   323
    #[inline]
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14161
diff changeset
   324
    pub fn is_zero(&self) -> bool {
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14161
diff changeset
   325
        self.x().is_zero() && self.y().is_zero()
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14161
diff changeset
   326
    }
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14161
diff changeset
   327
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14161
diff changeset
   328
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   329
    pub fn max_norm(&self) -> FPNum {
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   330
        cmp::max(self.x().abs(), self.y().abs())
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   331
    }
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   332
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   333
    #[inline]
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   334
    pub fn sqr_distance(&self) -> FPNum {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   335
        self.x().sqr() + self.y().sqr()
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   336
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   337
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   338
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   339
    pub fn distance(&self) -> FPNum {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   340
        let r = self.x_value | self.y_value;
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   341
        if r < LINEARIZE_TRESHOLD {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   342
            FPNum::from(r as u32)
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   343
        } else {
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   344
            let sqr: u128 = (self.x_value as u128).pow(2) + (self.y_value as u128).pow(2);
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   345
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   346
            FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   347
                sign_mask: POSITIVE_MASK,
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   348
                value: integral_sqrt_ext(sqr),
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   349
            }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   350
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   351
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   352
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   353
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   354
    pub fn is_in_range(&self, radius: FPNum) -> bool {
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   355
        self.max_norm() < radius && self.sqr_distance() < radius.sqr()
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   356
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   357
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   358
    #[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   359
    pub fn dot(&self, other: &FPPoint) -> FPNum {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   360
        self.x() * other.x() + self.y() * other.y()
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   361
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   362
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   363
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   364
impl PartialEq for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   365
    #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   366
    fn eq(&self, other: &Self) -> bool {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   367
        self.x() == other.x() && self.y() == other.y()
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   368
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   369
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   370
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   371
impl Eq for FPPoint {}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   372
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   373
impl ops::Neg for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   374
    type Output = Self;
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   375
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   376
    #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   377
    fn neg(self) -> Self {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   378
        Self::new(-self.x(), -self.y())
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   379
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   380
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   381
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   382
macro_rules! bin_op_impl {
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   383
    ($op: ty, $name: tt) => {
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   384
        impl $op for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   385
            type Output = Self;
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   386
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   387
            #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   388
            fn $name(self, rhs: Self) -> Self {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   389
                Self::new(self.x().$name(rhs.x()), self.y().$name(rhs.y()))
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   390
            }
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   391
        }
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   392
    };
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   393
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   394
13953
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   395
macro_rules! right_scalar_bin_op_impl {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   396
    ($($op: tt)::+, $name: tt) => {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   397
        impl $($op)::+<FPNum> for FPPoint {
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   398
            type Output = Self;
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   399
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   400
            #[inline]
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   401
            fn $name(self, rhs: FPNum) -> Self {
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   402
                Self::new(self.x().$name(rhs),
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   403
                          self.y().$name(rhs))
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   404
            }
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   405
        }
14161
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   406
    };
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   407
    ($($op: tt)::+<$arg: tt>, $name: tt) => {
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   408
        impl $($op)::+<$arg> for FPPoint {
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   409
            type Output = Self;
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   410
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   411
            #[inline]
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   412
            fn $name(self, rhs: $arg) -> Self {
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   413
                Self::new(self.x().$name(rhs),
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   414
                          self.y().$name(rhs))
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   415
            }
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   416
        }
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   417
    }
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   418
}
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   419
13953
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   420
macro_rules! left_scalar_bin_op_impl {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   421
    ($($op: tt)::+, $name: tt) => {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   422
        impl $($op)::+<FPPoint> for FPNum {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   423
            type Output = FPPoint;
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   424
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   425
            #[inline]
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   426
            fn $name(self, rhs: FPPoint) -> Self::Output {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   427
                Self::Output::new(self.$name(rhs.x()),
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   428
                                  self.$name(rhs.y()))
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   429
            }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   430
        }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   431
    }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   432
}
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   433
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   434
bin_op_impl!(ops::Add, add);
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   435
bin_op_impl!(ops::Sub, sub);
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   436
bin_op_impl!(ops::Mul, mul);
13950
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   437
bin_op_impl!(ops::Div, div);
13953
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   438
right_scalar_bin_op_impl!(ops::Add, add);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   439
right_scalar_bin_op_impl!(ops::Mul, mul);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   440
right_scalar_bin_op_impl!(ops::Sub, sub);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   441
right_scalar_bin_op_impl!(ops::Div, div);
14161
3078123e84ea Bezierize land outline
unc0rr
parents: 14160
diff changeset
   442
right_scalar_bin_op_impl!(ops::Div<u32>, div);
13953
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   443
left_scalar_bin_op_impl!(ops::Mul, mul);
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   444
13950
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   445
macro_rules! bin_assign_op_impl {
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   446
    ($typ: tt, $($op: tt)::+, $name: tt, $delegate: tt) => {
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   447
        bin_assign_op_impl!($typ, $($op)::+<$typ>, $name, $delegate);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   448
    };
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   449
    ($typ: tt, $($op: tt)::+<$arg: tt>, $name: tt, $delegate: tt) => {
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   450
        impl $($op)::+<$arg> for $typ {
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   451
            #[inline]
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   452
            fn $name(&mut self, rhs: $arg) {
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   453
                *self = *self $delegate rhs;
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   454
            }
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   455
        }
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   456
    }
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   457
}
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   458
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   459
bin_assign_op_impl!(FPNum, ops::AddAssign, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   460
bin_assign_op_impl!(FPNum, ops::SubAssign, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   461
bin_assign_op_impl!(FPNum, ops::MulAssign, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   462
bin_assign_op_impl!(FPNum, ops::DivAssign, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   463
bin_assign_op_impl!(FPNum, ops::MulAssign<i32>, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   464
bin_assign_op_impl!(FPNum, ops::DivAssign<i32>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   465
bin_assign_op_impl!(FPNum, ops::DivAssign<u32>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   466
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   467
bin_assign_op_impl!(FPPoint, ops::AddAssign, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   468
bin_assign_op_impl!(FPPoint, ops::SubAssign, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   469
bin_assign_op_impl!(FPPoint, ops::MulAssign, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   470
bin_assign_op_impl!(FPPoint, ops::DivAssign, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   471
bin_assign_op_impl!(FPPoint, ops::AddAssign<FPNum>, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   472
bin_assign_op_impl!(FPPoint, ops::SubAssign<FPNum>, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   473
bin_assign_op_impl!(FPPoint, ops::MulAssign<FPNum>, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   474
bin_assign_op_impl!(FPPoint, ops::DivAssign<FPNum>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   475
15239
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   476
pub fn integral_sqrt(value: u64) -> u64 {
15859
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   477
    let mut digits = (64u32 - 1).saturating_sub(value.leading_zeros()) & 0xFE;
15239
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   478
    let mut result = if value == 0 { 0u64 } else { 1u64 };
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   479
15239
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   480
    while digits != 0 {
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   481
        result <<= 1;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   482
        if (result + 1).pow(2) <= value >> (digits - 2) {
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   483
            result += 1;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   484
        }
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   485
        digits -= 2;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   486
    }
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   487
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   488
    result
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   489
}
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   490
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   491
pub fn integral_sqrt_ext(value: u128) -> u64 {
15859
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   492
    let mut digits = (128u32 - 1).saturating_sub(value.leading_zeros()) & 0xFE;
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   493
    let mut result = if value == 0 { 0u64 } else { 1u64 };
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   494
15859
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   495
    while digits != 0 {
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   496
        result <<= 1;
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   497
        if ((result + 1) as u128).pow(2) <= value >> (digits - 2) {
15859
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   498
            result += 1;
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   499
        }
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   500
        digits -= 2;
42109eb6ef51 port sqrt optimization to u128 case
alfadur
parents: 15240
diff changeset
   501
    }
15235
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   502
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   503
    result
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   504
}
58a0f2a6527b optimize sqrts
alfadur
parents: 15234
diff changeset
   505
15239
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15235
diff changeset
   506
#[inline]
13949
5fdc41cd0841 make methods public
alfadur
parents: 13948
diff changeset
   507
pub fn distance<T>(x: T, y: T) -> FPNum
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   508
where
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   509
    T: Into<i128> + std::fmt::Debug,
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   510
{
16079
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   511
    let [x_squared, y_squared] = [x, y].map(|i| (i.into().pow(2) as u128).saturating_mul(2^64));
624b74443b53 Make FPNum use saturating calculations
unC0Rr
parents: 15860
diff changeset
   512
    let sqr: u128 = x_squared.saturating_add(y_squared);
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   513
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   514
    FPNum {
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   515
        sign_mask: POSITIVE_MASK,
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   516
        value: integral_sqrt_ext(sqr),
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   517
    }
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   518
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   519
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   520
/* TODO:
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   521
 AngleSin
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   522
 AngleCos
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   523
*/
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   524
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   525
#[test]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   526
fn basics() {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   527
    let n = fp!(15 / 2);
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   528
    assert!(n.is_positive());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   529
    assert!(!n.is_negative());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   530
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   531
    assert!(!(-n).is_positive());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   532
    assert!((-n).is_negative());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   533
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   534
    assert_eq!(-(-n), n);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   535
    assert_eq!((-n).abs(), n);
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   536
    assert_eq!(-n, fp!(-15 / 2));
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   537
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   538
    assert_eq!(n.round(), 7);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   539
    assert_eq!((-n).round(), -7);
15240
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15239
diff changeset
   540
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15239
diff changeset
   541
    assert_eq!(f64::from(fp!(5/2)), 2.5f64);
15860
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   542
c910381d1ea9 limit scope of u128 operations in sqrt
alfadur
parents: 15859
diff changeset
   543
    assert_eq!(integral_sqrt_ext(0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF), 0xFFFF_FFFF_FFFF_FFFF);
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   544
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   545
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   546
#[test]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   547
fn zero() {
13911
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   548
    let z = fp!(0);
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   549
    let n = fp!(15 / 2);
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   550
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   551
    assert!(z.is_zero());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   552
    assert!(z.is_positive());
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   553
    assert!((-z).is_negative());
13907
2bfd7472ef1d Add some more tests
unc0rr
parents: 13905
diff changeset
   554
    assert_eq!(n - n, z);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13905
diff changeset
   555
    assert_eq!(-n + n, z);
13947
2717a5289d88 fix test
alfadur
parents: 13946
diff changeset
   556
    assert_eq!(n.with_sign_as(-n), -n);
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   557
}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   558
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   559
#[test]
13908
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   560
fn ord() {
13911
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   561
    let z = fp!(0);
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   562
    let n1_5 = fp!(3 / 2);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   563
    let n2_25 = fp!(9 / 4);
13908
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   564
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   565
    assert!(!(z > z));
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   566
    assert!(!(z < z));
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   567
    assert!(n2_25 > n1_5);
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   568
    assert!(-n2_25 < n1_5);
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   569
    assert!(-n2_25 < -n1_5);
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   570
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   571
    assert_eq!(n1_5.signum(), 1);
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   572
    assert_eq!((-n1_5).signum(), -1);
13908
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   573
}
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   574
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13907
diff changeset
   575
#[test]
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   576
fn arith() {
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   577
    let n1_5 = fp!(3 / 2);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   578
    let n2_25 = fp!(9 / 4);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   579
    let n_0_15 = fp!(-15 / 100);
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   580
13911
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   581
    assert_eq!(n1_5 + n1_5, fp!(3));
9ae1184886db add fpnum literal macro
alfadur
parents: 13909
diff changeset
   582
    assert_eq!(-n1_5 - n1_5, fp!(-3));
15232
924f7e38815e optimize fpnum operations
alfadur
parents: 14722
diff changeset
   583
    assert_eq!(n1_5 - n1_5, fp!(0));
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   584
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   585
    assert_eq!(n1_5 * n1_5, n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   586
    assert_eq!(-n1_5 * -n1_5, n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   587
    assert_eq!(n1_5 * -n1_5, -n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   588
    assert_eq!(-n1_5 * n1_5, -n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   589
13907
2bfd7472ef1d Add some more tests
unc0rr
parents: 13905
diff changeset
   590
    assert_eq!(-n2_25 / -n1_5, n1_5);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13905
diff changeset
   591
    assert_eq!(n1_5 / -10, n_0_15);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13905
diff changeset
   592
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   593
    assert_eq!(n1_5.sqr(), n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   594
    assert_eq!((-n1_5).sqr(), n2_25);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   595
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   596
    assert_eq!(n2_25.sqrt(), n1_5);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   597
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   598
    assert_eq!((n1_5 * n1_5 * n1_5.sqr()).sqrt(), n2_25);
13950
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   599
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   600
    let mut m = fp!(1);
ff77c9920007 add opassign implementations
alfadur
parents: 13949
diff changeset
   601
    m += n1_5;
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   602
    assert_eq!(m, fp!(5 / 2));
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   603
}
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   604
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   605
#[test]
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   606
fn test_distance_high_values() {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   607
    assert_eq!(distance(1_000_000i32, 0), fp!(1_000_000));
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   608
    assert_eq!(
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   609
        FPPoint::new(fp!(1_000_000), fp!(0)).distance(),
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   610
        fp!(1_000_000)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   611
    );
13905
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   612
}
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   613
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   614
#[test]
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   615
fn point() {
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   616
    let z = FPPoint::zero();
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   617
    let n = fp!(16 / 9);
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   618
    let p = FPPoint::new(fp!(1), fp!(-2));
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   619
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   620
    assert_eq!(p.sqr_distance(), fp!(5));
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   621
    assert_eq!(p + -p, FPPoint::zero());
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   622
    assert_eq!(p * z, z);
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   623
    assert_eq!(p.dot(&z), fp!(0));
13953
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13950
diff changeset
   624
    assert_eq!(n * p, p * n);
13946
2ee07e751171 add more fpnum functions
alfadur
parents: 13926
diff changeset
   625
    assert_eq!(distance(4, 3), fp!(5));
13948
cf28d7a2b7fe add scalar operations
alfadur
parents: 13947
diff changeset
   626
    assert_eq!(p * fp!(-3), FPPoint::new(fp!(-3), fp!(6)));
13960
665b4c6612ee fix fppoint.max_norm
alfadur
parents: 13953
diff changeset
   627
    assert_eq!(p.max_norm(), fp!(2));
14143
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14102
diff changeset
   628
}