Update main to output generated at 5aba546

Author: noah1510

include/unit_system.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -11,6 +12,7 @@
     #define UNIT_SYSTEM_EXPORT_MACRO
 #endif
 
+
 namespace sakurajin {
     namespace unit_system {
         // forward declare all units
@@ -45,9 +47,11 @@ namespace sakurajin {
             time_si(long double v, long double mult);
             time_si(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             time_si(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             time_si operator*(long double scalar) const;
             void    operator*=(long double scalar);
 
@@ -147,9 +151,11 @@ namespace sakurajin {
             length(long double v, long double mult);
             length(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             length(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             length operator*(long double scalar) const;
             void   operator*=(long double scalar);
 
@@ -251,9 +257,11 @@ namespace sakurajin {
             mass(long double v, long double mult);
             mass(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             mass(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             mass operator*(long double scalar) const;
             void operator*=(long double scalar);
 
@@ -345,9 +353,11 @@ namespace sakurajin {
             temperature(long double v, long double mult);
             temperature(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             temperature(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             temperature operator*(long double scalar) const;
             void        operator*=(long double scalar);
 
@@ -414,9 +424,11 @@ namespace sakurajin {
             amount(long double v, long double mult);
             amount(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             amount(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             amount operator*(long double scalar) const;
             void   operator*=(long double scalar);
 
@@ -483,9 +495,11 @@ namespace sakurajin {
             electric_current(long double v, long double mult);
             electric_current(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             electric_current(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             electric_current operator*(long double scalar) const;
             void             operator*=(long double scalar);
 
@@ -586,9 +600,11 @@ namespace sakurajin {
             luminous_intensity(long double v, long double mult);
             luminous_intensity(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             luminous_intensity(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             luminous_intensity operator*(long double scalar) const;
             void               operator*=(long double scalar);
 
@@ -656,9 +672,11 @@ namespace sakurajin {
             energy(long double v, long double mult);
             energy(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             energy(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             energy operator*(long double scalar) const;
             void   operator*=(long double scalar);
 
@@ -826,9 +844,11 @@ namespace sakurajin {
             power(long double v, long double mult);
             power(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             power(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             power operator*(long double scalar) const;
             void  operator*=(long double scalar);
 
@@ -932,9 +952,11 @@ namespace sakurajin {
             speed(long double v, long double mult);
             speed(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             speed(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             speed operator*(long double scalar) const;
             void  operator*=(long double scalar);
 
@@ -1011,9 +1033,11 @@ namespace sakurajin {
             acceleration(long double v, long double mult);
             acceleration(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             acceleration(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             acceleration operator*(long double scalar) const;
             void         operator*=(long double scalar);
 
@@ -1086,9 +1110,11 @@ namespace sakurajin {
             area(long double v, long double mult);
             area(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             area(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             area operator*(long double scalar) const;
             void operator*=(long double scalar);
 
@@ -1177,9 +1203,11 @@ namespace sakurajin {
             force(long double v, long double mult);
             force(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             force(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             force operator*(long double scalar) const;
             void  operator*=(long double scalar);
 
@@ -1285,9 +1313,11 @@ namespace sakurajin {
             momentum(long double v, long double mult);
             momentum(long double v, long double mult, long double off);
 
+
             template <std::intmax_t numerator, std::intmax_t denumerator = 1>
             momentum(long double v, std::ratio<numerator, denumerator> mult, long double off = 0);
 
+
             momentum operator*(long double scalar) const;
             void     operator*=(long double scalar);
 
@@ -1438,6 +1468,7 @@ namespace sakurajin {
     } // namespace unit_system
 } // namespace sakurajin
 
+
 // add all constants
 namespace sakurajin {
     namespace unit_system {

src/acceleration.cpp

@@ -1,3 +1,4 @@
+#include "cmath"
 #include "unit_system.hpp"
 
 sakurajin::unit_system::acceleration::acceleration()
@@ -155,11 +156,6 @@ sakurajin::unit_system::force sakurajin::unit_system::acceleration::operator*(co
 // external functions
 
 
-std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::acceleration& t) {
-    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
-    return os << t1.value << " metre per second^2";
-}
-
 sakurajin::unit_system::acceleration
 sakurajin::unit_system::unit_cast(const sakurajin::unit_system::acceleration& unit, long double new_multiplier, long double new_offset) {
     return unit.convert_copy(new_multiplier, new_offset);
@@ -175,11 +171,18 @@ sakurajin::unit_system::acceleration sakurajin::unit_system::clamp(const sakuraj
     return sakurajin::unit_system::acceleration{val, unit.multiplier, unit.offset};
 }
 
+
 sakurajin::unit_system::acceleration std::abs(const sakurajin::unit_system::acceleration& unit) {
     auto inv = -unit;
     return unit > inv ? unit : inv;
 }
 
+std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::acceleration& t) {
+    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
+    return os << t1.value << " metre per second^2";
+}
+
+
 // literals
 
 

src/amount.cpp

@@ -1,3 +1,4 @@
+#include "cmath"
 #include "unit_system.hpp"
 
 sakurajin::unit_system::amount::amount()
@@ -139,11 +140,6 @@ void sakurajin::unit_system::amount::operator=(const sakurajin::unit_system::amo
 // external functions
 
 
-std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::amount& t) {
-    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
-    return os << t1.value << " things";
-}
-
 sakurajin::unit_system::amount
 sakurajin::unit_system::unit_cast(const sakurajin::unit_system::amount& unit, long double new_multiplier, long double new_offset) {
     return unit.convert_copy(new_multiplier, new_offset);
@@ -159,11 +155,18 @@ sakurajin::unit_system::amount sakurajin::unit_system::clamp(const sakurajin::un
     return sakurajin::unit_system::amount{val, unit.multiplier, unit.offset};
 }
 
+
 sakurajin::unit_system::amount std::abs(const sakurajin::unit_system::amount& unit) {
     auto inv = -unit;
     return unit > inv ? unit : inv;
 }
 
+std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::amount& t) {
+    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
+    return os << t1.value << " things";
+}
+
+
 // literals
 
 

src/area.cpp

@@ -1,3 +1,4 @@
+#include "cmath"
 #include "unit_system.hpp"
 
 sakurajin::unit_system::area::area()
@@ -156,11 +157,6 @@ sakurajin::unit_system::length sakurajin::unit_system::sqrt(const area& unit) {
 }
 
 
-std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::area& t) {
-    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
-    return os << t1.value << " metre^2";
-}
-
 sakurajin::unit_system::area
 sakurajin::unit_system::unit_cast(const sakurajin::unit_system::area& unit, long double new_multiplier, long double new_offset) {
     return unit.convert_copy(new_multiplier, new_offset);
@@ -176,11 +172,18 @@ sakurajin::unit_system::area sakurajin::unit_system::clamp(const sakurajin::unit
     return sakurajin::unit_system::area{val, unit.multiplier, unit.offset};
 }
 
+
 sakurajin::unit_system::area std::abs(const sakurajin::unit_system::area& unit) {
     auto inv = -unit;
     return unit > inv ? unit : inv;
 }
 
+std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::area& t) {
+    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
+    return os << t1.value << " metre^2";
+}
+
+
 // literals
 
 

src/electric_current.cpp

@@ -1,3 +1,4 @@
+#include "cmath"
 #include "unit_system.hpp"
 
 sakurajin::unit_system::electric_current::electric_current()
@@ -142,11 +143,6 @@ void sakurajin::unit_system::electric_current::operator=(const sakurajin::unit_s
 // external functions
 
 
-std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::electric_current& t) {
-    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
-    return os << t1.value << " Ampere";
-}
-
 sakurajin::unit_system::electric_current sakurajin::unit_system::unit_cast(const sakurajin::unit_system::electric_current& unit,
                                                                            long double                                     new_multiplier,
                                                                            long double                                     new_offset) {
@@ -163,11 +159,18 @@ sakurajin::unit_system::electric_current sakurajin::unit_system::clamp(const sak
     return sakurajin::unit_system::electric_current{val, unit.multiplier, unit.offset};
 }
 
+
 sakurajin::unit_system::electric_current std::abs(const sakurajin::unit_system::electric_current& unit) {
     auto inv = -unit;
     return unit > inv ? unit : inv;
 }
 
+std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::electric_current& t) {
+    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
+    return os << t1.value << " Ampere";
+}
+
+
 // literals
 
 

src/energy.cpp

@@ -1,3 +1,4 @@
+#include "cmath"
 #include "unit_system.hpp"
 
 sakurajin::unit_system::energy::energy()
@@ -176,11 +177,6 @@ sakurajin::unit_system::momentum sakurajin::unit_system::energy::operator/(const
 // external functions
 
 
-std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::energy& t) {
-    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
-    return os << t1.value << " Joules";
-}
-
 sakurajin::unit_system::energy
 sakurajin::unit_system::unit_cast(const sakurajin::unit_system::energy& unit, long double new_multiplier, long double new_offset) {
     return unit.convert_copy(new_multiplier, new_offset);
@@ -196,11 +192,18 @@ sakurajin::unit_system::energy sakurajin::unit_system::clamp(const sakurajin::un
     return sakurajin::unit_system::energy{val, unit.multiplier, unit.offset};
 }
 
+
 sakurajin::unit_system::energy std::abs(const sakurajin::unit_system::energy& unit) {
     auto inv = -unit;
     return unit > inv ? unit : inv;
 }
 
+std::ostream& sakurajin::unit_system::operator<<(std::ostream& os, const sakurajin::unit_system::energy& t) {
+    auto t1 = sakurajin::unit_system::unit_cast(t, 1);
+    return os << t1.value << " Joules";
+}
+
+
 // literals