rust/fpnum/src/lib.rs
author sheepluva
Mon, 05 Aug 2019 00:20:45 +0200
changeset 15300 f382ec6dba11
parent 15224 b71bae455926
permissions -rw-r--r--
In hindsight my emscripten-ifdef (70d416a8f63f) is nonsense. As fpcrtl_glShaderSource() would not be defined and lead to compiling issues. So either it's 3 ifdefs (in pas2cRedo, pas2cSystem and misc.c), in order to toggle between fpcrtl_ and the native function, or alternatively have no ifdef for it at all. I'm going with none at all, which means emscripten will compile with the original (const) function prototype, being wrapped by the fpcrtl_ function, same as non-emscripten builds.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
     1
use std::{cmp, ops, ops::Shl};
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
     2
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     3
const POSITIVE_MASK: u64 = 0x0000_0000_0000_0000;
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     4
const NEGATIVE_MASK: u64 = 0xFFFF_FFFF_FFFF_FFFF;
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     5
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     6
#[inline]
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     7
fn bool_mask(is_negative: bool) -> u64 {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     8
    if is_negative {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
     9
        NEGATIVE_MASK
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    10
    } else {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    11
        POSITIVE_MASK
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    12
    }
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    13
}
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    14
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    15
#[derive(Clone, Debug, Copy)]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    16
pub struct FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    17
    sign_mask: u64,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    18
    value: u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    19
}
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
impl FPNum {
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
    22
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
    23
    pub fn new(numerator: i32, denominator: u32) -> Self {
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    24
        FPNum::from(numerator) / denominator
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    25
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    26
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    27
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
    28
    pub fn signum(&self) -> i8 {
15218
517f3a1dd5c2 reduce convertions in signum
alfadur
parents: 15217
diff changeset
    29
        (1u64 ^ self.sign_mask).wrapping_sub(self.sign_mask) as i8
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    30
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    31
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    32
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    33
    pub const fn is_negative(&self) -> bool {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    34
        self.sign_mask != POSITIVE_MASK
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    35
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    36
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    37
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    38
    pub const fn is_positive(&self) -> bool {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    39
        self.sign_mask == POSITIVE_MASK
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    40
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    41
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    42
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    43
    pub const fn is_zero(&self) -> bool {
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    44
        self.value == 0
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    45
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    46
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    47
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    48
    pub const fn abs(&self) -> Self {
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    49
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    50
            sign_mask: POSITIVE_MASK,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    51
            value: self.value,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    52
        }
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
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    55
    #[inline]
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14127
diff changeset
    56
    pub fn round(&self) -> i32 {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    57
        ((self.value >> 32) as i32 ^ self.sign_mask as i32).wrapping_sub(self.sign_mask as i32)
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    58
    }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    59
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
    60
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    61
    pub const fn abs_round(&self) -> u32 {
14086
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13944
diff changeset
    62
        (self.value >> 32) as u32
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13944
diff changeset
    63
    }
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13944
diff changeset
    64
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 13944
diff changeset
    65
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
    66
    pub fn sqr(&self) -> Self {
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    67
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    68
            sign_mask: 0,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    69
            value: ((self.value as u128).pow(2) >> 32) as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    70
        }
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
15223
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
    73
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
    74
    pub fn sqrt(&self) -> Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    75
        debug_assert!(self.is_positive());
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    76
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    77
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    78
            sign_mask: POSITIVE_MASK,
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
    79
            value: integral_sqrt(self.value) << 16,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    80
        }
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
    81
    }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
    82
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
    83
    #[inline]
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    84
    pub fn with_sign(&self, is_negative: bool) -> FPNum {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
    85
        FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    86
            sign_mask: bool_mask(is_negative),
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
    87
            ..*self
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
    88
        }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
    89
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
    90
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
    91
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
    92
    pub const fn with_sign_as(self, other: FPNum) -> FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    93
        FPNum {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    94
            sign_mask: other.sign_mask,
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    95
            ..self
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
    96
        }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
    97
    }
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
    98
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
    99
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
   100
    pub const fn point(self) -> FPPoint {
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   101
        FPPoint::new(self, self)
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   102
    }
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   103
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   104
    #[inline]
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   105
    const fn temp_i128(self) -> i128 {
15217
293250953317 fix u32 conversion sign
alfadur
parents: 15216
diff changeset
   106
        ((self.value ^ self.sign_mask) as i128).wrapping_sub(self.sign_mask as i128)
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   107
    }
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   108
}
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
impl From<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   111
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   112
    fn from(n: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   113
        FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   114
            sign_mask: bool_mask(n < 0),
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   115
            value: (n.abs() as u64) << 32,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   116
        }
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
impl From<u32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   121
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   122
    fn from(n: u32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   123
        Self {
15217
293250953317 fix u32 conversion sign
alfadur
parents: 15216
diff changeset
   124
            sign_mask: POSITIVE_MASK,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   125
            value: (n as u64) << 32,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   126
        }
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
impl From<FPNum> for f64 {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   131
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   132
    fn from(n: FPNum) -> Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   133
        if n.is_negative() {
15224
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15223
diff changeset
   134
            n.value as f64 / -0x1_0000_0000i64 as f64
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   135
        } else {
15224
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15223
diff changeset
   136
            n.value as f64 / 0x1_0000_0000i64 as f64
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   137
        }
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
impl PartialEq for FPNum {
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
   142
    #[inline]
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   143
    fn eq(&self, other: &Self) -> bool {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   144
        self.value == other.value && (self.sign_mask == other.sign_mask || self.value == 0)
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   145
    }
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
impl Eq for FPNum {}
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   149
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   150
impl PartialOrd for FPNum {
13890
cd39e87d7a80 inline more operators in fpnum
unc0rr
parents: 13889
diff changeset
   151
    #[inline]
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   152
    fn partial_cmp(&self, rhs: &Self) -> std::option::Option<std::cmp::Ordering> {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   153
        Some(self.cmp(rhs))
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   154
    }
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
impl Ord for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   158
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   159
    fn cmp(&self, rhs: &Self) -> cmp::Ordering {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   160
        self.temp_i128().cmp(&(rhs.temp_i128()))
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   161
    }
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
impl ops::Add for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   165
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   166
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   167
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   168
    fn add(self, rhs: Self) -> Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   169
        let tmp = self.temp_i128() + rhs.temp_i128();
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   170
        let mask = bool_mask(tmp < 0);
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   171
        Self {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   172
            sign_mask: mask,
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   173
            value: ((tmp as u64) ^ mask).wrapping_sub(mask),
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   174
        }
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
impl ops::Sub for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   179
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   180
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   181
    #[inline]
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   182
    fn sub(self, mut rhs: Self) -> Self {
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   183
        rhs.sign_mask = !rhs.sign_mask;
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   184
        self + rhs
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   185
    }
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
impl ops::Neg for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   189
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   190
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   191
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   192
    fn neg(self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   193
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   194
            sign_mask: !self.sign_mask,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   195
            value: self.value,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   196
        }
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
impl ops::Mul for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   201
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   202
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   203
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   204
    fn mul(self, rhs: Self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   205
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   206
            sign_mask: self.sign_mask ^ rhs.sign_mask,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   207
            value: ((self.value as u128 * rhs.value as u128) >> 32) as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   208
        }
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
impl ops::Mul<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   213
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   214
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   215
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   216
    fn mul(self, rhs: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   217
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   218
            sign_mask: self.sign_mask ^ bool_mask(rhs < 0),
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   219
            value: self.value * rhs.abs() as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   220
        }
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
impl ops::Div for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   225
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   226
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   227
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   228
    fn div(self, rhs: Self) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   229
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   230
            sign_mask: self.sign_mask ^ rhs.sign_mask,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   231
            value: (((self.value as u128) << 32) / rhs.value as u128) as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   232
        }
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
impl ops::Div<i32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   237
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   238
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   239
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   240
    fn div(self, rhs: i32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   241
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   242
            sign_mask: self.sign_mask ^ bool_mask(rhs < 0),
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   243
            value: self.value / rhs.abs() as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   244
        }
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
impl ops::Div<u32> for FPNum {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   249
    type Output = Self;
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   250
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   251
    #[inline]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   252
    fn div(self, rhs: u32) -> Self {
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   253
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   254
            sign_mask: self.sign_mask,
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   255
            value: self.value / rhs as u64,
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   256
        }
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
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   260
#[macro_export]
13896
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   261
macro_rules! fp {
14706
5e2c892b0222 allow fp! take denominator tokens
alfadur
parents: 14672
diff changeset
   262
    ($n: literal / $d: tt) => {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   263
        FPNum::new($n, $d)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   264
    };
14669
def1b9870078 match literals in fp macro
alfadur
parents: 14632
diff changeset
   265
    ($n: literal) => {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   266
        FPNum::from($n)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   267
    };
13896
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   268
}
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   269
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   270
const LINEARIZE_TRESHOLD: u64 = 0x1_0000;
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   271
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   272
#[derive(Clone, Copy, Debug)]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   273
pub struct FPPoint {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   274
    x_sign_mask: u32,
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   275
    y_sign_mask: u32,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   276
    x_value: u64,
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   277
    y_value: u64,
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   278
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   279
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   280
impl FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   281
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
   282
    pub const fn new(x: FPNum, y: FPNum) -> Self {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   283
        Self {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   284
            x_sign_mask: x.sign_mask as u32,
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   285
            y_sign_mask: y.sign_mask as u32,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   286
            x_value: x.value,
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   287
            y_value: y.value,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   288
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   289
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   290
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   291
    #[inline]
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   292
    pub fn zero() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   293
        FPPoint::new(fp!(0), fp!(0))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   294
    }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   295
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   296
    #[inline]
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   297
    pub fn unit_x() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   298
        FPPoint::new(fp!(1), fp!(0))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   299
    }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   300
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   301
    #[inline]
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   302
    pub fn unit_y() -> FPPoint {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   303
        FPPoint::new(fp!(0), fp!(1))
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   304
    }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   305
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   306
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
   307
    pub const fn x(&self) -> FPNum {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   308
        FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   309
            sign_mask: self.x_sign_mask as i32 as u64,
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   310
            value: self.x_value,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   311
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   312
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   313
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   314
    #[inline]
14632
2e2b31cf0871 make stuff const
alfadur
parents: 14212
diff changeset
   315
    pub const fn y(&self) -> FPNum {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   316
        FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   317
            sign_mask: self.y_sign_mask as i32 as u64,
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   318
            value: self.y_value,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   319
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   320
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   321
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   322
    #[inline]
14183
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14145
diff changeset
   323
    pub fn is_zero(&self) -> bool {
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14145
diff changeset
   324
        self.x().is_zero() && self.y().is_zero()
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14145
diff changeset
   325
    }
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14145
diff changeset
   326
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14145
diff changeset
   327
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   328
    pub fn max_norm(&self) -> FPNum {
13944
665b4c6612ee fix fppoint.max_norm
alfadur
parents: 13937
diff changeset
   329
        std::cmp::max(self.x().abs(), self.y().abs())
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   330
    }
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   331
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   332
    #[inline]
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   333
    pub fn sqr_distance(&self) -> FPNum {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   334
        self.x().sqr() + self.y().sqr()
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   335
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   336
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   337
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   338
    pub fn distance(&self) -> FPNum {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   339
        let r = self.x_value | self.y_value;
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   340
        if r < LINEARIZE_TRESHOLD {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   341
            FPNum::from(r as u32)
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   342
        } else {
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   343
            let sqr: u128 = (self.x_value as u128).pow(2) + (self.y_value as u128).pow(2);
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   344
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   345
            FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   346
                sign_mask: POSITIVE_MASK,
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   347
                value: integral_sqrt_ext(sqr) as u64,
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   348
            }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   349
        }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   350
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   351
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   352
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   353
    pub fn is_in_range(&self, radius: FPNum) -> bool {
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   354
        self.max_norm() < radius && self.sqr_distance() < radius.sqr()
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   355
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   356
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   357
    #[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   358
    pub fn dot(&self, other: &FPPoint) -> FPNum {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   359
        self.x() * other.x() + self.y() * other.y()
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   360
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   361
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   362
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   363
impl PartialEq for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   364
    #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   365
    fn eq(&self, other: &Self) -> bool {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   366
        self.x() == other.x() && self.y() == other.y()
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   367
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   368
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   369
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   370
impl Eq for FPPoint {}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   371
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   372
impl ops::Neg for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   373
    type Output = Self;
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   374
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   375
    #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   376
    fn neg(self) -> Self {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   377
        Self::new(-self.x(), -self.y())
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   378
    }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   379
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   380
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   381
macro_rules! bin_op_impl {
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   382
    ($op: ty, $name: tt) => {
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   383
        impl $op for FPPoint {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   384
            type Output = Self;
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   385
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   386
            #[inline]
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   387
            fn $name(self, rhs: Self) -> Self {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   388
                Self::new(self.x().$name(rhs.x()), self.y().$name(rhs.y()))
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   389
            }
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   390
        }
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   391
    };
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   392
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   393
13937
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   394
macro_rules! right_scalar_bin_op_impl {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   395
    ($($op: tt)::+, $name: tt) => {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   396
        impl $($op)::+<FPNum> for FPPoint {
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   397
            type Output = Self;
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   398
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   399
            #[inline]
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   400
            fn $name(self, rhs: FPNum) -> Self {
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   401
                Self::new(self.x().$name(rhs),
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   402
                          self.y().$name(rhs))
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   403
            }
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   404
        }
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   405
    };
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   406
    ($($op: tt)::+<$arg: tt>, $name: tt) => {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   407
        impl $($op)::+<$arg> for FPPoint {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   408
            type Output = Self;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   409
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   410
            #[inline]
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   411
            fn $name(self, rhs: $arg) -> Self {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   412
                Self::new(self.x().$name(rhs),
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   413
                          self.y().$name(rhs))
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   414
            }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   415
        }
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   416
    }
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   417
}
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   418
13937
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   419
macro_rules! left_scalar_bin_op_impl {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   420
    ($($op: tt)::+, $name: tt) => {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   421
        impl $($op)::+<FPPoint> for FPNum {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   422
            type Output = FPPoint;
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   423
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   424
            #[inline]
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   425
            fn $name(self, rhs: FPPoint) -> Self::Output {
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   426
                Self::Output::new(self.$name(rhs.x()),
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   427
                                  self.$name(rhs.y()))
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   428
            }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   429
        }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   430
    }
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   431
}
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   432
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   433
bin_op_impl!(ops::Add, add);
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   434
bin_op_impl!(ops::Sub, sub);
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   435
bin_op_impl!(ops::Mul, mul);
13934
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   436
bin_op_impl!(ops::Div, div);
13937
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   437
right_scalar_bin_op_impl!(ops::Add, add);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   438
right_scalar_bin_op_impl!(ops::Mul, mul);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   439
right_scalar_bin_op_impl!(ops::Sub, sub);
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   440
right_scalar_bin_op_impl!(ops::Div, div);
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   441
right_scalar_bin_op_impl!(ops::Div<u32>, div);
13937
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   442
left_scalar_bin_op_impl!(ops::Mul, mul);
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   443
13934
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   444
macro_rules! bin_assign_op_impl {
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   445
    ($typ: tt, $($op: tt)::+, $name: tt, $delegate: tt) => {
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   446
        bin_assign_op_impl!($typ, $($op)::+<$typ>, $name, $delegate);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   447
    };
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   448
    ($typ: tt, $($op: tt)::+<$arg: tt>, $name: tt, $delegate: tt) => {
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   449
        impl $($op)::+<$arg> for $typ {
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   450
            #[inline]
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   451
            fn $name(&mut self, rhs: $arg) {
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   452
                *self = *self $delegate rhs;
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   453
            }
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   454
        }
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   455
    }
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   456
}
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   457
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   458
bin_assign_op_impl!(FPNum, ops::AddAssign, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   459
bin_assign_op_impl!(FPNum, ops::SubAssign, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   460
bin_assign_op_impl!(FPNum, ops::MulAssign, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   461
bin_assign_op_impl!(FPNum, ops::DivAssign, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   462
bin_assign_op_impl!(FPNum, ops::MulAssign<i32>, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   463
bin_assign_op_impl!(FPNum, ops::DivAssign<i32>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   464
bin_assign_op_impl!(FPNum, ops::DivAssign<u32>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   465
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   466
bin_assign_op_impl!(FPPoint, ops::AddAssign, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   467
bin_assign_op_impl!(FPPoint, ops::SubAssign, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   468
bin_assign_op_impl!(FPPoint, ops::MulAssign, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   469
bin_assign_op_impl!(FPPoint, ops::DivAssign, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   470
bin_assign_op_impl!(FPPoint, ops::AddAssign<FPNum>, add_assign, +);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   471
bin_assign_op_impl!(FPPoint, ops::SubAssign<FPNum>, sub_assign, -);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   472
bin_assign_op_impl!(FPPoint, ops::MulAssign<FPNum>, mul_assign, *);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   473
bin_assign_op_impl!(FPPoint, ops::DivAssign<FPNum>, div_assign, /);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   474
15223
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   475
pub fn integral_sqrt(value: u64) -> u64 {
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   476
    let mut digits = (64u32 - 1).saturating_sub(value.leading_zeros()) & 0xFFFF_FFFE;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   477
    let mut result = if value == 0 { 0u64 } else { 1u64 };
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   478
15223
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   479
    while digits != 0 {
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   480
        result <<= 1;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   481
        if (result + 1).pow(2) <= value >> (digits - 2) {
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   482
            result += 1;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   483
        }
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   484
        digits -= 2;
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   485
    }
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   486
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   487
    result
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   488
}
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   489
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   490
pub fn integral_sqrt_ext(mut value: u128) -> u128 {
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   491
    let mut digit_sqr =
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   492
        0x40000000_00000000_00000000_00000000u128.wrapping_shr(value.leading_zeros() & 0xFFFF_FFFE);
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   493
    let mut result = 0u128;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   494
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   495
    while digit_sqr != 0 {
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   496
        let approx = result + digit_sqr;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   497
        result >>= 1;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   498
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   499
        if approx <= value {
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   500
            value -= approx;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   501
            result += digit_sqr;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   502
        }
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   503
        digit_sqr >>= 2;
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   504
    }
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   505
    result
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   506
}
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   507
15223
b2c086629fb8 optimize 64-bit sqrt some more
alfadur
parents: 15219
diff changeset
   508
#[inline]
13933
5fdc41cd0841 make methods public
alfadur
parents: 13932
diff changeset
   509
pub fn distance<T>(x: T, y: T) -> FPNum
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   510
where
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   511
    T: Into<i64> + std::fmt::Debug,
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   512
{
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   513
    let sqr: u128 = (x.into().pow(2) as u128).shl(64) + (y.into().pow(2) as u128).shl(64);
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   514
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   515
    FPNum {
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   516
        sign_mask: POSITIVE_MASK,
15219
58a0f2a6527b optimize sqrts
alfadur
parents: 15218
diff changeset
   517
        value: integral_sqrt_ext(sqr) as u64,
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   518
    }
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   519
}
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   520
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   521
/* TODO:
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   522
 AngleSin
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   523
 AngleCos
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
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   526
#[cfg(test)]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   527
#[test]
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   528
fn basics() {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   529
    let n = fp!(15 / 2);
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   530
    assert!(n.is_positive());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   531
    assert!(!n.is_negative());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   532
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   533
    assert!(!(-n).is_positive());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   534
    assert!((-n).is_negative());
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   535
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   536
    assert_eq!(-(-n), n);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   537
    assert_eq!((-n).abs(), n);
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   538
    assert_eq!(-n, fp!(-15 / 2));
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   539
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   540
    assert_eq!(n.round(), 7);
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   541
    assert_eq!((-n).round(), -7);
15224
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15223
diff changeset
   542
b71bae455926 fix fpnum to f64 conversion
alfadur
parents: 15223
diff changeset
   543
    assert_eq!(f64::from(fp!(5/2)), 2.5f64);
13887
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() {
13896
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   548
    let z = fp!(0);
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   549
    let n = fp!(15 / 2);
13887
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());
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   553
    assert!((-z).is_negative());
13888
2bfd7472ef1d Add some more tests
unc0rr
parents: 13887
diff changeset
   554
    assert_eq!(n - n, z);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13887
diff changeset
   555
    assert_eq!(-n + n, z);
13931
2717a5289d88 fix test
alfadur
parents: 13930
diff changeset
   556
    assert_eq!(n.with_sign_as(-n), -n);
13887
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]
13889
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   560
fn ord() {
13896
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   561
    let z = fp!(0);
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   562
    let n1_5 = fp!(3 / 2);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   563
    let n2_25 = fp!(9 / 4);
13889
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   564
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   565
    assert!(!(z > z));
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   566
    assert!(!(z < z));
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   567
    assert!(n2_25 > n1_5);
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   568
    assert!(-n2_25 < n1_5);
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   569
    assert!(-n2_25 < -n1_5);
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   570
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   571
    assert_eq!(n1_5.signum(), 1);
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   572
    assert_eq!((-n1_5).signum(), -1);
13889
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   573
}
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   574
fbbb4fcd6a75 delegate cmp to rustlib
alfadur
parents: 13888
diff changeset
   575
#[test]
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   576
fn arith() {
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   577
    let n1_5 = fp!(3 / 2);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   578
    let n2_25 = fp!(9 / 4);
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   579
    let n_0_15 = fp!(-15 / 100);
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   580
13896
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   581
    assert_eq!(n1_5 + n1_5, fp!(3));
9ae1184886db add fpnum literal macro
alfadur
parents: 13890
diff changeset
   582
    assert_eq!(-n1_5 - n1_5, fp!(-3));
15216
924f7e38815e optimize fpnum operations
alfadur
parents: 14706
diff changeset
   583
    assert_eq!(n1_5 - n1_5, fp!(0));
13887
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
13888
2bfd7472ef1d Add some more tests
unc0rr
parents: 13887
diff changeset
   590
    assert_eq!(-n2_25 / -n1_5, n1_5);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13887
diff changeset
   591
    assert_eq!(n1_5 / -10, n_0_15);
2bfd7472ef1d Add some more tests
unc0rr
parents: 13887
diff changeset
   592
13887
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);
13934
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   599
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   600
    let mut m = fp!(1);
ff77c9920007 add opassign implementations
alfadur
parents: 13933
diff changeset
   601
    m += n1_5;
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   602
    assert_eq!(m, fp!(5 / 2));
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   603
}
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   604
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   605
#[test]
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   606
fn test_distance_high_values() {
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   607
    assert_eq!(distance(1_000_000i32, 0), fp!(1_000_000));
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   608
    assert_eq!(
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   609
        FPPoint::new(fp!(1_000_000), fp!(0)).distance(),
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   610
        fp!(1_000_000)
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   611
    );
13887
b172a5d40eee Reimplement hwFloat library in rust for future use
unc0rr
parents:
diff changeset
   612
}
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   613
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   614
#[test]
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   615
fn point() {
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   616
    let z = FPPoint::zero();
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   617
    let n = fp!(16 / 9);
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   618
    let p = FPPoint::new(fp!(1), fp!(-2));
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   619
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   620
    assert_eq!(p.sqr_distance(), fp!(5));
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   621
    assert_eq!(p + -p, FPPoint::zero());
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   622
    assert_eq!(p * z, z);
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   623
    assert_eq!(p.dot(&z), fp!(0));
13937
7bb60596c27e add left scalar operations to fpnum
alfadur
parents: 13934
diff changeset
   624
    assert_eq!(n * p, p * n);
13930
2ee07e751171 add more fpnum functions
alfadur
parents: 13910
diff changeset
   625
    assert_eq!(distance(4, 3), fp!(5));
13932
cf28d7a2b7fe add scalar operations
alfadur
parents: 13931
diff changeset
   626
    assert_eq!(p * fp!(-3), FPPoint::new(fp!(-3), fp!(6)));
13944
665b4c6612ee fix fppoint.max_norm
alfadur
parents: 13937
diff changeset
   627
    assert_eq!(p.max_norm(), fp!(2));
14127
c27461e6a9eb Implement non-overflowing calculations for high values
unc0rr
parents: 14086
diff changeset
   628
}