From 23720d055edcc3a1b0e3db2993d968c9d8f49115 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 16 Mar 2021 09:32:28 +0100 Subject: [PATCH] refactor: Refactored the library file tree Resolves #249 --- README.md | 10 +-- docs/CHANGELOG.md | 1 + docs/quick_start.rst | 10 +-- docs/reference/systems/data/bitrate.rst | 2 +- docs/reference/systems/data/information.rst | 2 +- .../systems/physical/si/absorbed_dose.rst | 2 +- .../systems/physical/si/acceleration.rst | 2 +- .../physical/si/amount_of_substance.rst | 2 +- docs/reference/systems/physical/si/area.rst | 2 +- .../systems/physical/si/capacitance.rst | 2 +- .../physical/si/catalytic_activity.rst | 2 +- .../systems/physical/si/cgs/acceleration.rst | 2 +- .../systems/physical/si/cgs/area.rst | 2 +- .../systems/physical/si/cgs/energy.rst | 2 +- .../systems/physical/si/cgs/force.rst | 2 +- .../systems/physical/si/cgs/length.rst | 2 +- .../systems/physical/si/cgs/mass.rst | 2 +- .../systems/physical/si/cgs/power.rst | 2 +- .../systems/physical/si/cgs/pressure.rst | 2 +- .../systems/physical/si/cgs/speed.rst | 2 +- .../systems/physical/si/cgs/time.rst | 2 +- .../systems/physical/si/charge_density.rst | 2 +- .../systems/physical/si/concentration.rst | 2 +- .../systems/physical/si/conductance.rst | 2 +- .../systems/physical/si/current_density.rst | 2 +- .../reference/systems/physical/si/density.rst | 2 +- .../systems/physical/si/dynamic_viscosity.rst | 2 +- .../systems/physical/si/electric_charge.rst | 2 +- .../systems/physical/si/electric_current.rst | 2 +- .../physical/si/electric_field_strength.rst | 2 +- docs/reference/systems/physical/si/energy.rst | 2 +- docs/reference/systems/physical/si/force.rst | 2 +- .../systems/physical/si/fps/acceleration.rst | 2 +- .../systems/physical/si/fps/area.rst | 2 +- .../systems/physical/si/fps/density.rst | 2 +- .../systems/physical/si/fps/energy.rst | 2 +- .../systems/physical/si/fps/force.rst | 2 +- .../systems/physical/si/fps/length.rst | 2 +- .../systems/physical/si/fps/mass.rst | 2 +- .../systems/physical/si/fps/power.rst | 2 +- .../systems/physical/si/fps/pressure.rst | 2 +- .../systems/physical/si/fps/speed.rst | 2 +- .../systems/physical/si/fps/time.rst | 2 +- .../systems/physical/si/fps/volume.rst | 2 +- .../systems/physical/si/frequency.rst | 2 +- .../systems/physical/si/heat_capacity.rst | 2 +- .../systems/physical/si/iau/length.rst | 2 +- .../systems/physical/si/imperial/length.rst | 2 +- .../systems/physical/si/inductance.rst | 2 +- .../physical/si/international/area.rst | 2 +- .../physical/si/international/length.rst | 2 +- .../physical/si/international/speed.rst | 2 +- .../physical/si/international/volume.rst | 2 +- docs/reference/systems/physical/si/length.rst | 2 +- .../systems/physical/si/luminance.rst | 2 +- .../physical/si/luminous_intensity.rst | 2 +- .../systems/physical/si/magnetic_flux.rst | 2 +- .../physical/si/magnetic_induction.rst | 2 +- docs/reference/systems/physical/si/mass.rst | 2 +- .../systems/physical/si/molar_energy.rst | 2 +- .../systems/physical/si/momentum.rst | 2 +- .../systems/physical/si/permeability.rst | 2 +- .../systems/physical/si/permittivity.rst | 2 +- docs/reference/systems/physical/si/power.rst | 2 +- .../systems/physical/si/pressure.rst | 2 +- .../systems/physical/si/resistance.rst | 2 +- docs/reference/systems/physical/si/speed.rst | 2 +- .../systems/physical/si/surface_tension.rst | 2 +- .../physical/si/thermal_conductivity.rst | 2 +- .../physical/si/thermodynamic_temperature.rst | 2 +- docs/reference/systems/physical/si/time.rst | 2 +- .../physical/si/typographic/length.rst | 2 +- .../systems/physical/si/us/length.rst | 2 +- .../reference/systems/physical/si/voltage.rst | 2 +- docs/reference/systems/physical/si/volume.rst | 2 +- docs/use_cases/interoperability.rst | 2 +- docs/use_cases/unknown_dimensions.rst | 4 +- example/alternative_namespaces/acceleration.h | 2 +- example/alternative_namespaces/area.h | 2 +- .../capacitor_time_curve.cpp | 6 +- example/alternative_namespaces/density.h | 2 +- example/alternative_namespaces/force.h | 2 +- example/alternative_namespaces/length.h | 12 +-- example/alternative_namespaces/mass.h | 2 +- example/alternative_namespaces/time.h | 2 +- example/alternative_namespaces/voltage.h | 2 +- example/alternative_namespaces/volume.h | 2 +- example/avg_speed.cpp | 6 +- example/box_example.cpp | 14 +-- example/capacitor_time_curve.cpp | 8 +- example/clcpp_response.cpp | 18 ++-- example/conversion_factor.cpp | 2 +- example/experimental_angle.cpp | 6 +- example/foot_pound_second.cpp | 22 ++--- example/geographic.h | 2 +- example/glide_computer.h | 4 +- example/hello_units.cpp | 4 +- ...lman_filter-alpha_beta_filter_example2.cpp | 2 +- example/linear_algebra.cpp | 6 +- example/measurement.cpp | 2 +- example/total_energy.cpp | 6 +- example/unknown_dimension.cpp | 2 +- src/include/units/chrono.h | 2 +- .../units/data/{derived => }/bitrate.h | 4 +- src/include/units/data/data.h | 4 +- .../units/data/{base => }/information.h | 0 .../physical/si/{derived => }/absorbed_dose.h | 2 +- .../physical/si/{derived => }/acceleration.h | 2 +- .../si/{base => }/amount_of_substance.h | 0 .../si/{derived => }/angular_velocity.h | 2 +- .../units/physical/si/{derived => }/area.h | 2 +- .../physical/si/{derived => }/capacitance.h | 4 +- .../si/{derived => }/catalytic_activity.h | 4 +- .../si/cgs/{derived => }/acceleration.h | 2 +- .../physical/si/cgs/{derived => }/area.h | 4 +- src/include/units/physical/si/cgs/cgs.h | 20 ++--- .../physical/si/cgs/{derived => }/energy.h | 2 +- .../physical/si/cgs/{derived => }/force.h | 4 +- .../units/physical/si/cgs/{base => }/length.h | 2 +- .../units/physical/si/cgs/{base => }/mass.h | 2 +- .../physical/si/cgs/{derived => }/power.h | 2 +- .../physical/si/cgs/{derived => }/pressure.h | 4 +- .../physical/si/cgs/{derived => }/speed.h | 4 +- .../units/physical/si/cgs/{base => }/time.h | 2 +- .../si/{derived => }/charge_density.h | 4 +- .../physical/si/{derived => }/concentration.h | 4 +- .../physical/si/{derived => }/conductance.h | 2 +- src/include/units/physical/si/constants.h | 14 +-- .../si/{derived => }/current_density.h | 4 +- .../units/physical/si/{derived => }/density.h | 4 +- .../si/{derived => }/dynamic_viscosity.h | 4 +- .../si/{derived => }/electric_charge.h | 4 +- .../physical/si/{base => }/electric_current.h | 0 .../{derived => }/electric_field_strength.h | 2 +- .../units/physical/si/{derived => }/energy.h | 2 +- .../si/{derived => }/energy_density.h | 4 +- .../units/physical/si/{derived => }/force.h | 4 +- .../si/fps/{derived => }/acceleration.h | 2 +- .../physical/si/fps/{derived => }/area.h | 2 +- .../physical/si/fps/{derived => }/density.h | 4 +- .../physical/si/fps/{derived => }/energy.h | 2 +- .../physical/si/fps/{derived => }/force.h | 4 +- src/include/units/physical/si/fps/fps.h | 24 ++--- .../units/physical/si/fps/{base => }/length.h | 2 +- .../units/physical/si/fps/{base => }/mass.h | 2 +- .../physical/si/fps/{derived => }/power.h | 2 +- .../physical/si/fps/{derived => }/pressure.h | 4 +- .../physical/si/fps/{derived => }/speed.h | 4 +- .../units/physical/si/fps/{base => }/time.h | 2 +- .../physical/si/fps/{derived => }/volume.h | 2 +- .../physical/si/{derived => }/frequency.h | 2 +- .../physical/si/{derived => }/heat_capacity.h | 8 +- src/include/units/physical/si/iau/iau.h | 2 +- .../units/physical/si/iau/{base => }/length.h | 2 +- .../units/physical/si/imperial/imperial.h | 2 +- .../physical/si/imperial/{base => }/length.h | 2 +- .../physical/si/{derived => }/inductance.h | 4 +- .../si/international/{derived => }/area.h | 4 +- .../physical/si/international/international.h | 8 +- .../si/international/{base => }/length.h | 2 +- .../si/international/{derived => }/speed.h | 4 +- .../si/international/{derived => }/volume.h | 4 +- .../units/physical/si/{base => }/length.h | 0 .../physical/si/{derived => }/luminance.h | 4 +- .../si/{base => }/luminous_intensity.h | 0 .../physical/si/{derived => }/magnetic_flux.h | 4 +- .../si/{derived => }/magnetic_induction.h | 6 +- .../units/physical/si/{base => }/mass.h | 0 .../physical/si/{derived => }/molar_energy.h | 4 +- .../physical/si/{derived => }/momentum.h | 4 +- .../physical/si/{derived => }/permeability.h | 2 +- .../physical/si/{derived => }/permittivity.h | 2 +- .../units/physical/si/{derived => }/power.h | 2 +- .../physical/si/{derived => }/pressure.h | 4 +- .../physical/si/{derived => }/radioactivity.h | 2 +- .../physical/si/{derived => }/resistance.h | 4 +- src/include/units/physical/si/si.h | 88 +++++++++---------- .../units/physical/si/{derived => }/speed.h | 4 +- .../si/{derived => }/surface_tension.h | 2 +- .../si/{derived => }/thermal_conductivity.h | 4 +- .../si/{base => }/thermodynamic_temperature.h | 0 .../units/physical/si/{base => }/time.h | 0 .../units/physical/si/{derived => }/torque.h | 2 +- .../si/typographic/{base => }/length.h | 2 +- .../physical/si/typographic/typographic.h | 2 +- .../units/physical/si/us/{base => }/length.h | 2 +- src/include/units/physical/si/us/us.h | 2 +- .../units/physical/si/{derived => }/voltage.h | 4 +- .../units/physical/si/{derived => }/volume.h | 2 +- test/unit_test/runtime/distribution_test.cpp | 2 +- test/unit_test/runtime/math_test.cpp | 4 +- test/unit_test/static/cgs_test.cpp | 20 ++--- test/unit_test/static/chrono_test.cpp | 2 +- test/unit_test/static/concepts_test.cpp | 6 +- .../static/custom_rep_test_min_expl.cpp | 2 +- .../static/custom_rep_test_min_impl.cpp | 2 +- test/unit_test/static/custom_unit_test.cpp | 8 +- test/unit_test/static/fps_test.cpp | 20 ++--- test/unit_test/static/kind_test.cpp | 6 +- test/unit_test/static/math_test.cpp | 8 +- test/unit_test/static/quantity_kind_test.cpp | 10 +-- .../static/quantity_point_kind_test.cpp | 10 +-- test/unit_test/static/quantity_point_test.cpp | 8 +- test/unit_test/static/quantity_test.cpp | 12 +-- test/unit_test/static/si_cgs_test.cpp | 40 ++++----- test/unit_test/static/si_fps_test.cpp | 40 ++++----- test/unit_test/static/unit_constants.cpp | 10 +-- test/unit_test/static/us_test.cpp | 4 +- test_package/test_package.cpp | 2 +- 209 files changed, 452 insertions(+), 451 deletions(-) rename src/include/units/data/{derived => }/bitrate.h (97%) rename src/include/units/data/{base => }/information.h (100%) rename src/include/units/physical/si/{derived => }/absorbed_dose.h (99%) rename src/include/units/physical/si/{derived => }/acceleration.h (97%) rename src/include/units/physical/si/{base => }/amount_of_substance.h (100%) rename src/include/units/physical/si/{derived => }/angular_velocity.h (98%) rename src/include/units/physical/si/{derived => }/area.h (99%) rename src/include/units/physical/si/{derived => }/capacitance.h (99%) rename src/include/units/physical/si/{derived => }/catalytic_activity.h (99%) rename src/include/units/physical/si/cgs/{derived => }/acceleration.h (97%) rename src/include/units/physical/si/cgs/{derived => }/area.h (95%) rename src/include/units/physical/si/cgs/{derived => }/energy.h (97%) rename src/include/units/physical/si/cgs/{derived => }/force.h (95%) rename src/include/units/physical/si/cgs/{base => }/length.h (97%) rename src/include/units/physical/si/cgs/{base => }/mass.h (97%) rename src/include/units/physical/si/cgs/{derived => }/power.h (97%) rename src/include/units/physical/si/cgs/{derived => }/pressure.h (95%) rename src/include/units/physical/si/cgs/{derived => }/speed.h (95%) rename src/include/units/physical/si/cgs/{base => }/time.h (97%) rename src/include/units/physical/si/{derived => }/charge_density.h (96%) rename src/include/units/physical/si/{derived => }/concentration.h (95%) rename src/include/units/physical/si/{derived => }/conductance.h (99%) rename src/include/units/physical/si/{derived => }/current_density.h (95%) rename src/include/units/physical/si/{derived => }/density.h (95%) rename src/include/units/physical/si/{derived => }/dynamic_viscosity.h (95%) rename src/include/units/physical/si/{derived => }/electric_charge.h (95%) rename src/include/units/physical/si/{base => }/electric_current.h (100%) rename src/include/units/physical/si/{derived => }/electric_field_strength.h (97%) rename src/include/units/physical/si/{derived => }/energy.h (99%) rename src/include/units/physical/si/{derived => }/energy_density.h (95%) rename src/include/units/physical/si/{derived => }/force.h (99%) rename src/include/units/physical/si/fps/{derived => }/acceleration.h (97%) rename src/include/units/physical/si/fps/{derived => }/area.h (97%) rename src/include/units/physical/si/fps/{derived => }/density.h (95%) rename src/include/units/physical/si/fps/{derived => }/energy.h (98%) rename src/include/units/physical/si/fps/{derived => }/force.h (96%) rename src/include/units/physical/si/fps/{base => }/length.h (99%) rename src/include/units/physical/si/fps/{base => }/mass.h (99%) rename src/include/units/physical/si/fps/{derived => }/power.h (98%) rename src/include/units/physical/si/fps/{derived => }/pressure.h (97%) rename src/include/units/physical/si/fps/{derived => }/speed.h (96%) rename src/include/units/physical/si/fps/{base => }/time.h (97%) rename src/include/units/physical/si/fps/{derived => }/volume.h (98%) rename src/include/units/physical/si/{derived => }/frequency.h (99%) rename src/include/units/physical/si/{derived => }/heat_capacity.h (94%) rename src/include/units/physical/si/iau/{base => }/length.h (98%) rename src/include/units/physical/si/imperial/{base => }/length.h (97%) rename src/include/units/physical/si/{derived => }/inductance.h (98%) rename src/include/units/physical/si/international/{derived => }/area.h (94%) rename src/include/units/physical/si/international/{base => }/length.h (99%) rename src/include/units/physical/si/international/{derived => }/speed.h (94%) rename src/include/units/physical/si/international/{derived => }/volume.h (94%) rename src/include/units/physical/si/{base => }/length.h (100%) rename src/include/units/physical/si/{derived => }/luminance.h (95%) rename src/include/units/physical/si/{base => }/luminous_intensity.h (100%) rename src/include/units/physical/si/{derived => }/magnetic_flux.h (98%) rename src/include/units/physical/si/{derived => }/magnetic_induction.h (98%) rename src/include/units/physical/si/{base => }/mass.h (100%) rename src/include/units/physical/si/{derived => }/molar_energy.h (95%) rename src/include/units/physical/si/{derived => }/momentum.h (95%) rename src/include/units/physical/si/{derived => }/permeability.h (97%) rename src/include/units/physical/si/{derived => }/permittivity.h (97%) rename src/include/units/physical/si/{derived => }/power.h (99%) rename src/include/units/physical/si/{derived => }/pressure.h (99%) rename src/include/units/physical/si/{derived => }/radioactivity.h (99%) rename src/include/units/physical/si/{derived => }/resistance.h (98%) rename src/include/units/physical/si/{derived => }/speed.h (96%) rename src/include/units/physical/si/{derived => }/surface_tension.h (97%) rename src/include/units/physical/si/{derived => }/thermal_conductivity.h (95%) rename src/include/units/physical/si/{base => }/thermodynamic_temperature.h (100%) rename src/include/units/physical/si/{base => }/time.h (100%) rename src/include/units/physical/si/{derived => }/torque.h (97%) rename src/include/units/physical/si/typographic/{base => }/length.h (98%) rename src/include/units/physical/si/us/{base => }/length.h (98%) rename src/include/units/physical/si/{derived => }/voltage.h (99%) rename src/include/units/physical/si/{derived => }/volume.h (99%) diff --git a/README.md b/README.md index fd947432..de6a0096 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ analysis and unit/quantity manipulation. The basic idea and design heavily bases Here is a small example of possible operations: ```cpp -#include -#include -#include +#include +#include +#include using namespace units::physical::si; @@ -62,8 +62,8 @@ the below example for a quick preview of basic library features: ```cpp #include -#include -#include +#include +#include #include #include diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 995deae2..f1fac7e8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,7 @@ - **0.7.0 WIP** - (!) refactor: `ScalableNumber` renamed to `QuantityValue` - (!) refactor: output stream operators moved to the `units/quantity_io.h` header file + - (!) refactor: Refactored the library file tree - refactor: quantity (kind) point updated to reflect latest changes to `quantity` - refactor: basic concepts, `quantity` and `quantity_cast` refactored - refactor: `abs()` definition refactored to be more explicit about the return type diff --git a/docs/quick_start.rst b/docs/quick_start.rst index b3a507dc..419c2ab1 100644 --- a/docs/quick_start.rst +++ b/docs/quick_start.rst @@ -3,9 +3,9 @@ Quick Start Here is a small example of possible operations:: - #include - #include - #include + #include + #include + #include using namespace units::physical::si; @@ -38,8 +38,8 @@ performed without sacrificing on accuracy. Please see the below example for a qu of basic library features:: #include - #include - #include + #include + #include #include #include diff --git a/docs/reference/systems/data/bitrate.rst b/docs/reference/systems/data/bitrate.rst index 76a3a24e..03d6b81e 100644 --- a/docs/reference/systems/data/bitrate.rst +++ b/docs/reference/systems/data/bitrate.rst @@ -1,4 +1,4 @@ Bitrate ======= -.. doxygenfile:: data/derived/bitrate.h +.. doxygenfile:: data/bitrate.h diff --git a/docs/reference/systems/data/information.rst b/docs/reference/systems/data/information.rst index 61a65efb..37920d28 100644 --- a/docs/reference/systems/data/information.rst +++ b/docs/reference/systems/data/information.rst @@ -1,4 +1,4 @@ Information =========== -.. doxygenfile:: data/base/information.h +.. doxygenfile:: data/information.h diff --git a/docs/reference/systems/physical/si/absorbed_dose.rst b/docs/reference/systems/physical/si/absorbed_dose.rst index 42ef860d..30826f1a 100644 --- a/docs/reference/systems/physical/si/absorbed_dose.rst +++ b/docs/reference/systems/physical/si/absorbed_dose.rst @@ -1,4 +1,4 @@ Absorbed Dose ============= -.. doxygenfile:: si/derived/absorbed_dose.h +.. doxygenfile:: si/absorbed_dose.h diff --git a/docs/reference/systems/physical/si/acceleration.rst b/docs/reference/systems/physical/si/acceleration.rst index cf021fa2..da1884b1 100644 --- a/docs/reference/systems/physical/si/acceleration.rst +++ b/docs/reference/systems/physical/si/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/derived/acceleration.h +.. doxygenfile:: si/acceleration.h diff --git a/docs/reference/systems/physical/si/amount_of_substance.rst b/docs/reference/systems/physical/si/amount_of_substance.rst index 3a1f4cc5..39753e85 100644 --- a/docs/reference/systems/physical/si/amount_of_substance.rst +++ b/docs/reference/systems/physical/si/amount_of_substance.rst @@ -1,4 +1,4 @@ Amount of Substance =================== -.. doxygenfile:: si/base/amount_of_substance.h +.. doxygenfile:: si/amount_of_substance.h diff --git a/docs/reference/systems/physical/si/area.rst b/docs/reference/systems/physical/si/area.rst index 5c12f807..b1f8c2c4 100644 --- a/docs/reference/systems/physical/si/area.rst +++ b/docs/reference/systems/physical/si/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/derived/area.h +.. doxygenfile:: si/area.h diff --git a/docs/reference/systems/physical/si/capacitance.rst b/docs/reference/systems/physical/si/capacitance.rst index cf5ace80..00fe1dc3 100644 --- a/docs/reference/systems/physical/si/capacitance.rst +++ b/docs/reference/systems/physical/si/capacitance.rst @@ -1,4 +1,4 @@ Capacitance =========== -.. doxygenfile:: si/derived/capacitance.h +.. doxygenfile:: si/capacitance.h diff --git a/docs/reference/systems/physical/si/catalytic_activity.rst b/docs/reference/systems/physical/si/catalytic_activity.rst index a0b9c877..ec5ceb09 100644 --- a/docs/reference/systems/physical/si/catalytic_activity.rst +++ b/docs/reference/systems/physical/si/catalytic_activity.rst @@ -1,4 +1,4 @@ Catalytic Activity ================== -.. doxygenfile:: si/derived/catalytic_activity.h +.. doxygenfile:: si/catalytic_activity.h diff --git a/docs/reference/systems/physical/si/cgs/acceleration.rst b/docs/reference/systems/physical/si/cgs/acceleration.rst index c961855a..4a04598d 100644 --- a/docs/reference/systems/physical/si/cgs/acceleration.rst +++ b/docs/reference/systems/physical/si/cgs/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/cgs/derived/acceleration.h +.. doxygenfile:: si/cgs/acceleration.h diff --git a/docs/reference/systems/physical/si/cgs/area.rst b/docs/reference/systems/physical/si/cgs/area.rst index 55ab28ef..e97b1dfa 100644 --- a/docs/reference/systems/physical/si/cgs/area.rst +++ b/docs/reference/systems/physical/si/cgs/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/cgs/derived/area.h +.. doxygenfile:: si/cgs/area.h diff --git a/docs/reference/systems/physical/si/cgs/energy.rst b/docs/reference/systems/physical/si/cgs/energy.rst index 462af4d1..1026e75f 100644 --- a/docs/reference/systems/physical/si/cgs/energy.rst +++ b/docs/reference/systems/physical/si/cgs/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/cgs/derived/energy.h +.. doxygenfile:: si/cgs/energy.h diff --git a/docs/reference/systems/physical/si/cgs/force.rst b/docs/reference/systems/physical/si/cgs/force.rst index a466f661..4f3e2cb5 100644 --- a/docs/reference/systems/physical/si/cgs/force.rst +++ b/docs/reference/systems/physical/si/cgs/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/cgs/derived/force.h +.. doxygenfile:: si/cgs/force.h diff --git a/docs/reference/systems/physical/si/cgs/length.rst b/docs/reference/systems/physical/si/cgs/length.rst index f72c220a..5deefb4b 100644 --- a/docs/reference/systems/physical/si/cgs/length.rst +++ b/docs/reference/systems/physical/si/cgs/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/cgs/base/length.h +.. doxygenfile:: si/cgs/length.h diff --git a/docs/reference/systems/physical/si/cgs/mass.rst b/docs/reference/systems/physical/si/cgs/mass.rst index 0084e8d7..9be1a471 100644 --- a/docs/reference/systems/physical/si/cgs/mass.rst +++ b/docs/reference/systems/physical/si/cgs/mass.rst @@ -1,4 +1,4 @@ Mass ==== -.. doxygenfile:: si/cgs/base/mass.h +.. doxygenfile:: si/cgs/mass.h diff --git a/docs/reference/systems/physical/si/cgs/power.rst b/docs/reference/systems/physical/si/cgs/power.rst index f7f79e6d..8725ef62 100644 --- a/docs/reference/systems/physical/si/cgs/power.rst +++ b/docs/reference/systems/physical/si/cgs/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/cgs/derived/power.h +.. doxygenfile:: si/cgs/power.h diff --git a/docs/reference/systems/physical/si/cgs/pressure.rst b/docs/reference/systems/physical/si/cgs/pressure.rst index 6f280d60..5efd0777 100644 --- a/docs/reference/systems/physical/si/cgs/pressure.rst +++ b/docs/reference/systems/physical/si/cgs/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/cgs/derived/pressure.h +.. doxygenfile:: si/cgs/pressure.h diff --git a/docs/reference/systems/physical/si/cgs/speed.rst b/docs/reference/systems/physical/si/cgs/speed.rst index 619b4828..37d6226e 100644 --- a/docs/reference/systems/physical/si/cgs/speed.rst +++ b/docs/reference/systems/physical/si/cgs/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/cgs/derived/speed.h +.. doxygenfile:: si/cgs/speed.h diff --git a/docs/reference/systems/physical/si/cgs/time.rst b/docs/reference/systems/physical/si/cgs/time.rst index 9f348d47..30e42097 100644 --- a/docs/reference/systems/physical/si/cgs/time.rst +++ b/docs/reference/systems/physical/si/cgs/time.rst @@ -1,4 +1,4 @@ Time ==== -.. doxygenfile:: si/cgs/base/time.h +.. doxygenfile:: si/cgs/time.h diff --git a/docs/reference/systems/physical/si/charge_density.rst b/docs/reference/systems/physical/si/charge_density.rst index fbbb1666..5474ab48 100644 --- a/docs/reference/systems/physical/si/charge_density.rst +++ b/docs/reference/systems/physical/si/charge_density.rst @@ -1,4 +1,4 @@ Charge Density ============== -.. doxygenfile:: si/derived/charge_density.h +.. doxygenfile:: si/charge_density.h diff --git a/docs/reference/systems/physical/si/concentration.rst b/docs/reference/systems/physical/si/concentration.rst index 205e4c53..3c5bb235 100644 --- a/docs/reference/systems/physical/si/concentration.rst +++ b/docs/reference/systems/physical/si/concentration.rst @@ -1,4 +1,4 @@ Concentration ============= -.. doxygenfile:: si/derived/concentration.h +.. doxygenfile:: si/concentration.h diff --git a/docs/reference/systems/physical/si/conductance.rst b/docs/reference/systems/physical/si/conductance.rst index c86f2c29..47af0e27 100644 --- a/docs/reference/systems/physical/si/conductance.rst +++ b/docs/reference/systems/physical/si/conductance.rst @@ -1,4 +1,4 @@ Conductance =========== -.. doxygenfile:: si/derived/conductance.h +.. doxygenfile:: si/conductance.h diff --git a/docs/reference/systems/physical/si/current_density.rst b/docs/reference/systems/physical/si/current_density.rst index 0a914697..a3441a83 100644 --- a/docs/reference/systems/physical/si/current_density.rst +++ b/docs/reference/systems/physical/si/current_density.rst @@ -1,4 +1,4 @@ Current density =============== -.. doxygenfile:: si/derived/current_density.h +.. doxygenfile:: si/current_density.h diff --git a/docs/reference/systems/physical/si/density.rst b/docs/reference/systems/physical/si/density.rst index 932f6416..4cf74da7 100644 --- a/docs/reference/systems/physical/si/density.rst +++ b/docs/reference/systems/physical/si/density.rst @@ -1,4 +1,4 @@ Density ======= -.. doxygenfile:: si/derived/density.h +.. doxygenfile:: si/density.h diff --git a/docs/reference/systems/physical/si/dynamic_viscosity.rst b/docs/reference/systems/physical/si/dynamic_viscosity.rst index 66e206e9..667e1310 100644 --- a/docs/reference/systems/physical/si/dynamic_viscosity.rst +++ b/docs/reference/systems/physical/si/dynamic_viscosity.rst @@ -1,4 +1,4 @@ Dynamic Viscosity ================= -.. doxygenfile:: si/derived/dynamic_viscosity.h +.. doxygenfile:: si/dynamic_viscosity.h diff --git a/docs/reference/systems/physical/si/electric_charge.rst b/docs/reference/systems/physical/si/electric_charge.rst index 5df2f87c..93b5497f 100644 --- a/docs/reference/systems/physical/si/electric_charge.rst +++ b/docs/reference/systems/physical/si/electric_charge.rst @@ -1,4 +1,4 @@ Electric Charge =============== -.. doxygenfile:: si/derived/electric_charge.h +.. doxygenfile:: si/electric_charge.h diff --git a/docs/reference/systems/physical/si/electric_current.rst b/docs/reference/systems/physical/si/electric_current.rst index c70e8e2e..6cbb37ad 100644 --- a/docs/reference/systems/physical/si/electric_current.rst +++ b/docs/reference/systems/physical/si/electric_current.rst @@ -1,4 +1,4 @@ Electric Current ================ -.. doxygenfile:: si/base/electric_current.h +.. doxygenfile:: si/electric_current.h diff --git a/docs/reference/systems/physical/si/electric_field_strength.rst b/docs/reference/systems/physical/si/electric_field_strength.rst index 159c835d..71f09277 100644 --- a/docs/reference/systems/physical/si/electric_field_strength.rst +++ b/docs/reference/systems/physical/si/electric_field_strength.rst @@ -1,4 +1,4 @@ Electric Field Strength ======================= -.. doxygenfile:: si/derived/electric_field_strength.h +.. doxygenfile:: si/electric_field_strength.h diff --git a/docs/reference/systems/physical/si/energy.rst b/docs/reference/systems/physical/si/energy.rst index e1ae0ac2..db30ee27 100644 --- a/docs/reference/systems/physical/si/energy.rst +++ b/docs/reference/systems/physical/si/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/derived/energy.h +.. doxygenfile:: si/energy.h diff --git a/docs/reference/systems/physical/si/force.rst b/docs/reference/systems/physical/si/force.rst index fe8a749b..f47473ae 100644 --- a/docs/reference/systems/physical/si/force.rst +++ b/docs/reference/systems/physical/si/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/derived/force.h +.. doxygenfile:: si/force.h diff --git a/docs/reference/systems/physical/si/fps/acceleration.rst b/docs/reference/systems/physical/si/fps/acceleration.rst index 1606bf02..dfc5d510 100644 --- a/docs/reference/systems/physical/si/fps/acceleration.rst +++ b/docs/reference/systems/physical/si/fps/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/fps/derived/acceleration.h +.. doxygenfile:: si/fps/acceleration.h diff --git a/docs/reference/systems/physical/si/fps/area.rst b/docs/reference/systems/physical/si/fps/area.rst index efa08ed3..00cc067c 100644 --- a/docs/reference/systems/physical/si/fps/area.rst +++ b/docs/reference/systems/physical/si/fps/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/fps/derived/area.h +.. doxygenfile:: si/fps/area.h diff --git a/docs/reference/systems/physical/si/fps/density.rst b/docs/reference/systems/physical/si/fps/density.rst index a00d29e3..c0b70ddf 100644 --- a/docs/reference/systems/physical/si/fps/density.rst +++ b/docs/reference/systems/physical/si/fps/density.rst @@ -1,4 +1,4 @@ Density ======= -.. doxygenfile:: si/fps/derived/density.h +.. doxygenfile:: si/fps/density.h diff --git a/docs/reference/systems/physical/si/fps/energy.rst b/docs/reference/systems/physical/si/fps/energy.rst index 85b16ae8..949cbd91 100644 --- a/docs/reference/systems/physical/si/fps/energy.rst +++ b/docs/reference/systems/physical/si/fps/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/fps/derived/energy.h +.. doxygenfile:: si/fps/energy.h diff --git a/docs/reference/systems/physical/si/fps/force.rst b/docs/reference/systems/physical/si/fps/force.rst index 3643bbb3..02b355b7 100644 --- a/docs/reference/systems/physical/si/fps/force.rst +++ b/docs/reference/systems/physical/si/fps/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/fps/derived/force.h +.. doxygenfile:: si/fps/force.h diff --git a/docs/reference/systems/physical/si/fps/length.rst b/docs/reference/systems/physical/si/fps/length.rst index e1b61a0a..e32c16f3 100644 --- a/docs/reference/systems/physical/si/fps/length.rst +++ b/docs/reference/systems/physical/si/fps/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/fps/base/length.h +.. doxygenfile:: si/fps/length.h diff --git a/docs/reference/systems/physical/si/fps/mass.rst b/docs/reference/systems/physical/si/fps/mass.rst index 6f5fcc3f..e77ac1ba 100644 --- a/docs/reference/systems/physical/si/fps/mass.rst +++ b/docs/reference/systems/physical/si/fps/mass.rst @@ -1,4 +1,4 @@ Mass ==== -.. doxygenfile:: si/fps/base/mass.h +.. doxygenfile:: si/fps/mass.h diff --git a/docs/reference/systems/physical/si/fps/power.rst b/docs/reference/systems/physical/si/fps/power.rst index c4d3c31f..28f52f3c 100644 --- a/docs/reference/systems/physical/si/fps/power.rst +++ b/docs/reference/systems/physical/si/fps/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/fps/derived/power.h +.. doxygenfile:: si/fps/power.h diff --git a/docs/reference/systems/physical/si/fps/pressure.rst b/docs/reference/systems/physical/si/fps/pressure.rst index f330a15b..5144b50d 100644 --- a/docs/reference/systems/physical/si/fps/pressure.rst +++ b/docs/reference/systems/physical/si/fps/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/fps/derived/pressure.h +.. doxygenfile:: si/fps/pressure.h diff --git a/docs/reference/systems/physical/si/fps/speed.rst b/docs/reference/systems/physical/si/fps/speed.rst index def1a20f..3f3388d9 100644 --- a/docs/reference/systems/physical/si/fps/speed.rst +++ b/docs/reference/systems/physical/si/fps/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/fps/derived/speed.h +.. doxygenfile:: si/fps/speed.h diff --git a/docs/reference/systems/physical/si/fps/time.rst b/docs/reference/systems/physical/si/fps/time.rst index a1d1bcdb..0be4a9ad 100644 --- a/docs/reference/systems/physical/si/fps/time.rst +++ b/docs/reference/systems/physical/si/fps/time.rst @@ -1,4 +1,4 @@ Time ==== -.. doxygenfile:: si/fps/base/time.h +.. doxygenfile:: si/fps/time.h diff --git a/docs/reference/systems/physical/si/fps/volume.rst b/docs/reference/systems/physical/si/fps/volume.rst index 90cb67bb..788fd445 100644 --- a/docs/reference/systems/physical/si/fps/volume.rst +++ b/docs/reference/systems/physical/si/fps/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/fps/derived/volume.h +.. doxygenfile:: si/fps/volume.h diff --git a/docs/reference/systems/physical/si/frequency.rst b/docs/reference/systems/physical/si/frequency.rst index f96af4e4..da111def 100644 --- a/docs/reference/systems/physical/si/frequency.rst +++ b/docs/reference/systems/physical/si/frequency.rst @@ -1,4 +1,4 @@ Frequency ========= -.. doxygenfile:: si/derived/frequency.h +.. doxygenfile:: si/frequency.h diff --git a/docs/reference/systems/physical/si/heat_capacity.rst b/docs/reference/systems/physical/si/heat_capacity.rst index 7d10fdef..5f3183c9 100644 --- a/docs/reference/systems/physical/si/heat_capacity.rst +++ b/docs/reference/systems/physical/si/heat_capacity.rst @@ -1,4 +1,4 @@ Heat Capacity ============= -.. doxygenfile:: si/derived/heat_capacity.h +.. doxygenfile:: si/heat_capacity.h diff --git a/docs/reference/systems/physical/si/iau/length.rst b/docs/reference/systems/physical/si/iau/length.rst index 652999bb..a87bd7b7 100644 --- a/docs/reference/systems/physical/si/iau/length.rst +++ b/docs/reference/systems/physical/si/iau/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/iau/base/length.h +.. doxygenfile:: si/iau/length.h diff --git a/docs/reference/systems/physical/si/imperial/length.rst b/docs/reference/systems/physical/si/imperial/length.rst index 6268a665..bf66246d 100644 --- a/docs/reference/systems/physical/si/imperial/length.rst +++ b/docs/reference/systems/physical/si/imperial/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/imperial/base/length.h +.. doxygenfile:: si/imperial/length.h diff --git a/docs/reference/systems/physical/si/inductance.rst b/docs/reference/systems/physical/si/inductance.rst index 4de852e3..8a128cbd 100644 --- a/docs/reference/systems/physical/si/inductance.rst +++ b/docs/reference/systems/physical/si/inductance.rst @@ -1,4 +1,4 @@ Inductance ========== -.. doxygenfile:: si/derived/inductance.h +.. doxygenfile:: si/inductance.h diff --git a/docs/reference/systems/physical/si/international/area.rst b/docs/reference/systems/physical/si/international/area.rst index 4f52a6c2..f4841300 100644 --- a/docs/reference/systems/physical/si/international/area.rst +++ b/docs/reference/systems/physical/si/international/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/international/derived/area.h +.. doxygenfile:: si/international/area.h diff --git a/docs/reference/systems/physical/si/international/length.rst b/docs/reference/systems/physical/si/international/length.rst index 5dc17f00..878b4b17 100644 --- a/docs/reference/systems/physical/si/international/length.rst +++ b/docs/reference/systems/physical/si/international/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/international/base/length.h +.. doxygenfile:: si/international/length.h diff --git a/docs/reference/systems/physical/si/international/speed.rst b/docs/reference/systems/physical/si/international/speed.rst index 8e817de4..19f2e2eb 100644 --- a/docs/reference/systems/physical/si/international/speed.rst +++ b/docs/reference/systems/physical/si/international/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: speed/derived/speed.h +.. doxygenfile:: speed/speed.h diff --git a/docs/reference/systems/physical/si/international/volume.rst b/docs/reference/systems/physical/si/international/volume.rst index 31a4e91a..2530bbbe 100644 --- a/docs/reference/systems/physical/si/international/volume.rst +++ b/docs/reference/systems/physical/si/international/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/international/derived/volume.h +.. doxygenfile:: si/international/volume.h diff --git a/docs/reference/systems/physical/si/length.rst b/docs/reference/systems/physical/si/length.rst index ae4b302e..34aace98 100644 --- a/docs/reference/systems/physical/si/length.rst +++ b/docs/reference/systems/physical/si/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/base/length.h +.. doxygenfile:: si/length.h diff --git a/docs/reference/systems/physical/si/luminance.rst b/docs/reference/systems/physical/si/luminance.rst index aee9a3db..2621b0b6 100644 --- a/docs/reference/systems/physical/si/luminance.rst +++ b/docs/reference/systems/physical/si/luminance.rst @@ -1,4 +1,4 @@ Luminance ========= -.. doxygenfile:: si/derived/luminance.h +.. doxygenfile:: si/luminance.h diff --git a/docs/reference/systems/physical/si/luminous_intensity.rst b/docs/reference/systems/physical/si/luminous_intensity.rst index c900a596..a1ed45c5 100644 --- a/docs/reference/systems/physical/si/luminous_intensity.rst +++ b/docs/reference/systems/physical/si/luminous_intensity.rst @@ -1,4 +1,4 @@ Luminous Intensity ================== -.. doxygenfile:: si/base/luminous_intensity.h +.. doxygenfile:: si/luminous_intensity.h diff --git a/docs/reference/systems/physical/si/magnetic_flux.rst b/docs/reference/systems/physical/si/magnetic_flux.rst index cdb1042f..99f2b06f 100644 --- a/docs/reference/systems/physical/si/magnetic_flux.rst +++ b/docs/reference/systems/physical/si/magnetic_flux.rst @@ -1,4 +1,4 @@ Magnetic Flux ============= -.. doxygenfile:: si/derived/magnetic_flux.h +.. doxygenfile:: si/magnetic_flux.h diff --git a/docs/reference/systems/physical/si/magnetic_induction.rst b/docs/reference/systems/physical/si/magnetic_induction.rst index 9be12cbc..be77904b 100644 --- a/docs/reference/systems/physical/si/magnetic_induction.rst +++ b/docs/reference/systems/physical/si/magnetic_induction.rst @@ -1,4 +1,4 @@ Magnetic Induction ================== -.. doxygenfile:: si/derived/magnetic_induction.h +.. doxygenfile:: si/magnetic_induction.h diff --git a/docs/reference/systems/physical/si/mass.rst b/docs/reference/systems/physical/si/mass.rst index 76eb6978..a569508d 100644 --- a/docs/reference/systems/physical/si/mass.rst +++ b/docs/reference/systems/physical/si/mass.rst @@ -1,4 +1,4 @@ Mass ==== -.. doxygenfile:: si/base/mass.h +.. doxygenfile:: si/mass.h diff --git a/docs/reference/systems/physical/si/molar_energy.rst b/docs/reference/systems/physical/si/molar_energy.rst index 026125cb..60401a69 100644 --- a/docs/reference/systems/physical/si/molar_energy.rst +++ b/docs/reference/systems/physical/si/molar_energy.rst @@ -1,4 +1,4 @@ Molar Energy ============ -.. doxygenfile:: si/derived/molar_energy.h +.. doxygenfile:: si/molar_energy.h diff --git a/docs/reference/systems/physical/si/momentum.rst b/docs/reference/systems/physical/si/momentum.rst index 87417312..76949ccb 100644 --- a/docs/reference/systems/physical/si/momentum.rst +++ b/docs/reference/systems/physical/si/momentum.rst @@ -1,4 +1,4 @@ Momentum ======== -.. doxygenfile:: si/derived/momentum.h +.. doxygenfile:: si/momentum.h diff --git a/docs/reference/systems/physical/si/permeability.rst b/docs/reference/systems/physical/si/permeability.rst index 1ac577a3..da5e0ec7 100644 --- a/docs/reference/systems/physical/si/permeability.rst +++ b/docs/reference/systems/physical/si/permeability.rst @@ -1,4 +1,4 @@ Permeability ============ -.. doxygenfile:: si/derived/permeability.h +.. doxygenfile:: si/permeability.h diff --git a/docs/reference/systems/physical/si/permittivity.rst b/docs/reference/systems/physical/si/permittivity.rst index d7688c85..befdb2a2 100644 --- a/docs/reference/systems/physical/si/permittivity.rst +++ b/docs/reference/systems/physical/si/permittivity.rst @@ -1,4 +1,4 @@ Permittivity ============ -.. doxygenfile:: si/derived/permittivity.h +.. doxygenfile:: si/permittivity.h diff --git a/docs/reference/systems/physical/si/power.rst b/docs/reference/systems/physical/si/power.rst index a49f0e27..f3d6e0b9 100644 --- a/docs/reference/systems/physical/si/power.rst +++ b/docs/reference/systems/physical/si/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/derived/power.h +.. doxygenfile:: si/power.h diff --git a/docs/reference/systems/physical/si/pressure.rst b/docs/reference/systems/physical/si/pressure.rst index 1c731c04..ccd0c014 100644 --- a/docs/reference/systems/physical/si/pressure.rst +++ b/docs/reference/systems/physical/si/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/derived/pressure.h +.. doxygenfile:: si/pressure.h diff --git a/docs/reference/systems/physical/si/resistance.rst b/docs/reference/systems/physical/si/resistance.rst index 113f5870..d5ce1512 100644 --- a/docs/reference/systems/physical/si/resistance.rst +++ b/docs/reference/systems/physical/si/resistance.rst @@ -1,4 +1,4 @@ Resistance ========== -.. doxygenfile:: si/derived/resistance.h +.. doxygenfile:: si/resistance.h diff --git a/docs/reference/systems/physical/si/speed.rst b/docs/reference/systems/physical/si/speed.rst index 17692856..1b7278be 100644 --- a/docs/reference/systems/physical/si/speed.rst +++ b/docs/reference/systems/physical/si/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/derived/speed.h +.. doxygenfile:: si/speed.h diff --git a/docs/reference/systems/physical/si/surface_tension.rst b/docs/reference/systems/physical/si/surface_tension.rst index fe3d620e..94212027 100644 --- a/docs/reference/systems/physical/si/surface_tension.rst +++ b/docs/reference/systems/physical/si/surface_tension.rst @@ -1,4 +1,4 @@ Surface Tension =============== -.. doxygenfile:: si/derived/surface_tension.h +.. doxygenfile:: si/surface_tension.h diff --git a/docs/reference/systems/physical/si/thermal_conductivity.rst b/docs/reference/systems/physical/si/thermal_conductivity.rst index 396f48c9..dd6d94cd 100644 --- a/docs/reference/systems/physical/si/thermal_conductivity.rst +++ b/docs/reference/systems/physical/si/thermal_conductivity.rst @@ -1,4 +1,4 @@ Thermal Conductivity ==================== -.. doxygenfile:: si/derived/thermal_conductivity.h +.. doxygenfile:: si/thermal_conductivity.h diff --git a/docs/reference/systems/physical/si/thermodynamic_temperature.rst b/docs/reference/systems/physical/si/thermodynamic_temperature.rst index b0cf85ed..50008dff 100644 --- a/docs/reference/systems/physical/si/thermodynamic_temperature.rst +++ b/docs/reference/systems/physical/si/thermodynamic_temperature.rst @@ -1,4 +1,4 @@ Temperature =========== -.. doxygenfile:: si/base/thermodynamic_temperature.h +.. doxygenfile:: si/thermodynamic_temperature.h diff --git a/docs/reference/systems/physical/si/time.rst b/docs/reference/systems/physical/si/time.rst index 4929ed4a..54d4b41d 100644 --- a/docs/reference/systems/physical/si/time.rst +++ b/docs/reference/systems/physical/si/time.rst @@ -1,4 +1,4 @@ Time ==== -.. doxygenfile:: si/base/time.h +.. doxygenfile:: si/time.h diff --git a/docs/reference/systems/physical/si/typographic/length.rst b/docs/reference/systems/physical/si/typographic/length.rst index a163ac66..363fc1f6 100644 --- a/docs/reference/systems/physical/si/typographic/length.rst +++ b/docs/reference/systems/physical/si/typographic/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/typographic/base/length.h +.. doxygenfile:: si/typographic/length.h diff --git a/docs/reference/systems/physical/si/us/length.rst b/docs/reference/systems/physical/si/us/length.rst index d2220d20..97e365ad 100644 --- a/docs/reference/systems/physical/si/us/length.rst +++ b/docs/reference/systems/physical/si/us/length.rst @@ -1,4 +1,4 @@ Length ====== -.. doxygenfile:: si/us/base/length.h +.. doxygenfile:: si/us/length.h diff --git a/docs/reference/systems/physical/si/voltage.rst b/docs/reference/systems/physical/si/voltage.rst index 9fefdaa2..633aac5a 100644 --- a/docs/reference/systems/physical/si/voltage.rst +++ b/docs/reference/systems/physical/si/voltage.rst @@ -1,4 +1,4 @@ Voltage ======= -.. doxygenfile:: si/derived/voltage.h +.. doxygenfile:: si/voltage.h diff --git a/docs/reference/systems/physical/si/volume.rst b/docs/reference/systems/physical/si/volume.rst index 6de41df1..7af5cc86 100644 --- a/docs/reference/systems/physical/si/volume.rst +++ b/docs/reference/systems/physical/si/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/derived/volume.h +.. doxygenfile:: si/volume.h diff --git a/docs/use_cases/interoperability.rst b/docs/use_cases/interoperability.rst index 36569007..f5e31a3c 100644 --- a/docs/use_cases/interoperability.rst +++ b/docs/use_cases/interoperability.rst @@ -16,7 +16,7 @@ provide the following: For example, to provide support for the ``std::chrono::duration`` it is enough to define:: #include - #include + #include #include namespace units { diff --git a/docs/use_cases/unknown_dimensions.rst b/docs/use_cases/unknown_dimensions.rst index 65a41596..a79db984 100644 --- a/docs/use_cases/unknown_dimensions.rst +++ b/docs/use_cases/unknown_dimensions.rst @@ -41,8 +41,8 @@ dimensions used in the division operation: .. code-block:: :emphasize-lines: 1-2,8,10 - #include - #include + #include + #include using namespace units::physical::si; diff --git a/example/alternative_namespaces/acceleration.h b/example/alternative_namespaces/acceleration.h index e631d743..404a3187 100644 --- a/example/alternative_namespaces/acceleration.h +++ b/example/alternative_namespaces/acceleration.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/area.h b/example/alternative_namespaces/area.h index 7532451c..fb1a9ab9 100644 --- a/example/alternative_namespaces/area.h +++ b/example/alternative_namespaces/area.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace area { diff --git a/example/alternative_namespaces/capacitor_time_curve.cpp b/example/alternative_namespaces/capacitor_time_curve.cpp index 6d833d16..1492db7e 100644 --- a/example/alternative_namespaces/capacitor_time_curve.cpp +++ b/example/alternative_namespaces/capacitor_time_curve.cpp @@ -20,9 +20,9 @@ physical_quantities */ -#include -#include -#include +#include +#include +#include #include #include #include "./voltage.h" diff --git a/example/alternative_namespaces/density.h b/example/alternative_namespaces/density.h index 7d8b9882..870da078 100644 --- a/example/alternative_namespaces/density.h +++ b/example/alternative_namespaces/density.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/force.h b/example/alternative_namespaces/force.h index 4efc348c..ad0945e5 100644 --- a/example/alternative_namespaces/force.h +++ b/example/alternative_namespaces/force.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/length.h b/example/alternative_namespaces/length.h index 7275027d..d9a40687 100644 --- a/example/alternative_namespaces/length.h +++ b/example/alternative_namespaces/length.h @@ -2,12 +2,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/mass.h b/example/alternative_namespaces/mass.h index 1d3e74a8..57816bc7 100644 --- a/example/alternative_namespaces/mass.h +++ b/example/alternative_namespaces/mass.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/time.h b/example/alternative_namespaces/time.h index 1660e7a0..f1d6650f 100644 --- a/example/alternative_namespaces/time.h +++ b/example/alternative_namespaces/time.h @@ -1,7 +1,7 @@ #pragma once -#include +#include // named qtime due to conflict with time_t time(time_t*) namespace q_time { diff --git a/example/alternative_namespaces/voltage.h b/example/alternative_namespaces/voltage.h index e409d4b5..258f597c 100644 --- a/example/alternative_namespaces/voltage.h +++ b/example/alternative_namespaces/voltage.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/volume.h b/example/alternative_namespaces/volume.h index 0f21df37..9a201e49 100644 --- a/example/alternative_namespaces/volume.h +++ b/example/alternative_namespaces/volume.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/avg_speed.cpp b/example/avg_speed.cpp index 48c68fb2..1ae667d9 100644 --- a/example/avg_speed.cpp +++ b/example/avg_speed.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include #include diff --git a/example/box_example.cpp b/example/box_example.cpp index 79c93a4a..5ed8de99 100644 --- a/example/box_example.cpp +++ b/example/box_example.cpp @@ -1,11 +1,11 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/example/capacitor_time_curve.cpp b/example/capacitor_time_curve.cpp index 677f875f..bc6ee838 100644 --- a/example/capacitor_time_curve.cpp +++ b/example/capacitor_time_curve.cpp @@ -20,10 +20,10 @@ physical_quantities */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp index e32037b8..83827f66 100644 --- a/example/clcpp_response.cpp +++ b/example/clcpp_response.cpp @@ -16,15 +16,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp index 1e0b45a1..ffe2abb1 100644 --- a/example/conversion_factor.cpp +++ b/example/conversion_factor.cpp @@ -15,7 +15,7 @@ along with this program. If not, see http://www.gnu.org/licenses./ */ -#include +#include #include #include #include diff --git a/example/experimental_angle.cpp b/example/experimental_angle.cpp index bc9777f7..116660e4 100644 --- a/example/experimental_angle.cpp +++ b/example/experimental_angle.cpp @@ -22,9 +22,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp index a0d3d186..81d64649 100644 --- a/example/foot_pound_second.cpp +++ b/example/foot_pound_second.cpp @@ -22,17 +22,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/example/geographic.h b/example/geographic.h index d2fb46d4..ed0c9edb 100644 --- a/example/geographic.h +++ b/example/geographic.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/example/glide_computer.h b/example/glide_computer.h index 4d4cac5f..cedbb893 100644 --- a/example/glide_computer.h +++ b/example/glide_computer.h @@ -25,8 +25,8 @@ #include "geographic.h" #include #include -#include -#include +#include +#include #include // An example of a really simplified tactical glide computer diff --git a/example/hello_units.cpp b/example/hello_units.cpp index 0b6da684..60a3099f 100644 --- a/example/hello_units.cpp +++ b/example/hello_units.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include -#include -#include +#include +#include #include #include diff --git a/example/kalman_filter-alpha_beta_filter_example2.cpp b/example/kalman_filter-alpha_beta_filter_example2.cpp index e614d08a..c0e47acc 100644 --- a/example/kalman_filter-alpha_beta_filter_example2.cpp +++ b/example/kalman_filter-alpha_beta_filter_example2.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/example/linear_algebra.cpp b/example/linear_algebra.cpp index 119cd30f..ee993df9 100644 --- a/example/linear_algebra.cpp +++ b/example/linear_algebra.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/example/measurement.cpp b/example/measurement.cpp index cc42c436..819277c1 100644 --- a/example/measurement.cpp +++ b/example/measurement.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include #include #include diff --git a/example/total_energy.cpp b/example/total_energy.cpp index 8bc0de90..d4d7e50c 100644 --- a/example/total_energy.cpp +++ b/example/total_energy.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/example/unknown_dimension.cpp b/example/unknown_dimension.cpp index 9d898423..822a18e0 100644 --- a/example/unknown_dimension.cpp +++ b/example/unknown_dimension.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include #include diff --git a/src/include/units/chrono.h b/src/include/units/chrono.h index 8a057c29..9b6ff25b 100644 --- a/src/include/units/chrono.h +++ b/src/include/units/chrono.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units { diff --git a/src/include/units/data/derived/bitrate.h b/src/include/units/data/bitrate.h similarity index 97% rename from src/include/units/data/derived/bitrate.h rename to src/include/units/data/bitrate.h index 2acb0caa..cb99ffd0 100644 --- a/src/include/units/data/derived/bitrate.h +++ b/src/include/units/data/bitrate.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include #include namespace units::data { diff --git a/src/include/units/data/data.h b/src/include/units/data/data.h index a07e6dc7..357edbea 100644 --- a/src/include/units/data/data.h +++ b/src/include/units/data/data.h @@ -22,6 +22,6 @@ #pragma once -#include -#include +#include +#include #include diff --git a/src/include/units/data/base/information.h b/src/include/units/data/information.h similarity index 100% rename from src/include/units/data/base/information.h rename to src/include/units/data/information.h diff --git a/src/include/units/physical/si/derived/absorbed_dose.h b/src/include/units/physical/si/absorbed_dose.h similarity index 99% rename from src/include/units/physical/si/derived/absorbed_dose.h rename to src/include/units/physical/si/absorbed_dose.h index 3bc2175b..81a07ec5 100644 --- a/src/include/units/physical/si/derived/absorbed_dose.h +++ b/src/include/units/physical/si/absorbed_dose.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/derived/acceleration.h b/src/include/units/physical/si/acceleration.h similarity index 97% rename from src/include/units/physical/si/derived/acceleration.h rename to src/include/units/physical/si/acceleration.h index 4ea7f484..94934ac8 100644 --- a/src/include/units/physical/si/derived/acceleration.h +++ b/src/include/units/physical/si/acceleration.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/base/amount_of_substance.h b/src/include/units/physical/si/amount_of_substance.h similarity index 100% rename from src/include/units/physical/si/base/amount_of_substance.h rename to src/include/units/physical/si/amount_of_substance.h diff --git a/src/include/units/physical/si/derived/angular_velocity.h b/src/include/units/physical/si/angular_velocity.h similarity index 98% rename from src/include/units/physical/si/derived/angular_velocity.h rename to src/include/units/physical/si/angular_velocity.h index 05d3815e..f10136c4 100644 --- a/src/include/units/physical/si/derived/angular_velocity.h +++ b/src/include/units/physical/si/angular_velocity.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/src/include/units/physical/si/derived/area.h b/src/include/units/physical/si/area.h similarity index 99% rename from src/include/units/physical/si/derived/area.h rename to src/include/units/physical/si/area.h index d5717206..3907e11a 100644 --- a/src/include/units/physical/si/derived/area.h +++ b/src/include/units/physical/si/area.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/capacitance.h b/src/include/units/physical/si/capacitance.h similarity index 99% rename from src/include/units/physical/si/derived/capacitance.h rename to src/include/units/physical/si/capacitance.h index 63ce06df..c057ddb5 100644 --- a/src/include/units/physical/si/derived/capacitance.h +++ b/src/include/units/physical/si/capacitance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/catalytic_activity.h b/src/include/units/physical/si/catalytic_activity.h similarity index 99% rename from src/include/units/physical/si/derived/catalytic_activity.h rename to src/include/units/physical/si/catalytic_activity.h index 0c4220c2..5887530c 100644 --- a/src/include/units/physical/si/derived/catalytic_activity.h +++ b/src/include/units/physical/si/catalytic_activity.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/derived/acceleration.h b/src/include/units/physical/si/cgs/acceleration.h similarity index 97% rename from src/include/units/physical/si/cgs/derived/acceleration.h rename to src/include/units/physical/si/cgs/acceleration.h index 5b4c8ba3..bd9503f7 100644 --- a/src/include/units/physical/si/cgs/derived/acceleration.h +++ b/src/include/units/physical/si/cgs/acceleration.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/derived/area.h b/src/include/units/physical/si/cgs/area.h similarity index 95% rename from src/include/units/physical/si/cgs/derived/area.h rename to src/include/units/physical/si/cgs/area.h index 99cd3807..632bdcd5 100644 --- a/src/include/units/physical/si/cgs/derived/area.h +++ b/src/include/units/physical/si/cgs/area.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/cgs.h b/src/include/units/physical/si/cgs/cgs.h index 18ece1ef..690c2240 100644 --- a/src/include/units/physical/si/cgs/cgs.h +++ b/src/include/units/physical/si/cgs/cgs.h @@ -22,14 +22,14 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/include/units/physical/si/cgs/derived/energy.h b/src/include/units/physical/si/cgs/energy.h similarity index 97% rename from src/include/units/physical/si/cgs/derived/energy.h rename to src/include/units/physical/si/cgs/energy.h index 9ffaded6..9269577f 100644 --- a/src/include/units/physical/si/cgs/derived/energy.h +++ b/src/include/units/physical/si/cgs/energy.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/derived/force.h b/src/include/units/physical/si/cgs/force.h similarity index 95% rename from src/include/units/physical/si/cgs/derived/force.h rename to src/include/units/physical/si/cgs/force.h index 9dcd3422..32bea9d8 100644 --- a/src/include/units/physical/si/cgs/derived/force.h +++ b/src/include/units/physical/si/cgs/force.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/base/length.h b/src/include/units/physical/si/cgs/length.h similarity index 97% rename from src/include/units/physical/si/cgs/base/length.h rename to src/include/units/physical/si/cgs/length.h index 9565ad68..ab06c53d 100644 --- a/src/include/units/physical/si/cgs/base/length.h +++ b/src/include/units/physical/si/cgs/length.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/base/mass.h b/src/include/units/physical/si/cgs/mass.h similarity index 97% rename from src/include/units/physical/si/cgs/base/mass.h rename to src/include/units/physical/si/cgs/mass.h index f1eb154f..f88b95e4 100644 --- a/src/include/units/physical/si/cgs/base/mass.h +++ b/src/include/units/physical/si/cgs/mass.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/derived/power.h b/src/include/units/physical/si/cgs/power.h similarity index 97% rename from src/include/units/physical/si/cgs/derived/power.h rename to src/include/units/physical/si/cgs/power.h index 2e88313d..b1838b65 100644 --- a/src/include/units/physical/si/cgs/derived/power.h +++ b/src/include/units/physical/si/cgs/power.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/derived/pressure.h b/src/include/units/physical/si/cgs/pressure.h similarity index 95% rename from src/include/units/physical/si/cgs/derived/pressure.h rename to src/include/units/physical/si/cgs/pressure.h index 7f1e0f0c..bfa5c07f 100644 --- a/src/include/units/physical/si/cgs/derived/pressure.h +++ b/src/include/units/physical/si/cgs/pressure.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/derived/speed.h b/src/include/units/physical/si/cgs/speed.h similarity index 95% rename from src/include/units/physical/si/cgs/derived/speed.h rename to src/include/units/physical/si/cgs/speed.h index 61b0c598..1e363bc4 100644 --- a/src/include/units/physical/si/cgs/derived/speed.h +++ b/src/include/units/physical/si/cgs/speed.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/base/time.h b/src/include/units/physical/si/cgs/time.h similarity index 97% rename from src/include/units/physical/si/cgs/base/time.h rename to src/include/units/physical/si/cgs/time.h index 28e1f225..7c9fbf41 100644 --- a/src/include/units/physical/si/cgs/base/time.h +++ b/src/include/units/physical/si/cgs/time.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/derived/charge_density.h b/src/include/units/physical/si/charge_density.h similarity index 96% rename from src/include/units/physical/si/derived/charge_density.h rename to src/include/units/physical/si/charge_density.h index bc9ef162..8e9e0538 100644 --- a/src/include/units/physical/si/derived/charge_density.h +++ b/src/include/units/physical/si/charge_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/concentration.h b/src/include/units/physical/si/concentration.h similarity index 95% rename from src/include/units/physical/si/derived/concentration.h rename to src/include/units/physical/si/concentration.h index 52aa05f7..f6e27cba 100644 --- a/src/include/units/physical/si/derived/concentration.h +++ b/src/include/units/physical/si/concentration.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/conductance.h b/src/include/units/physical/si/conductance.h similarity index 99% rename from src/include/units/physical/si/derived/conductance.h rename to src/include/units/physical/si/conductance.h index 9d660a04..2b0f9113 100644 --- a/src/include/units/physical/si/derived/conductance.h +++ b/src/include/units/physical/si/conductance.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/constants.h b/src/include/units/physical/si/constants.h index b8e86595..1aef9240 100644 --- a/src/include/units/physical/si/constants.h +++ b/src/include/units/physical/si/constants.h @@ -22,13 +22,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace units::physical::si::si2019 { diff --git a/src/include/units/physical/si/derived/current_density.h b/src/include/units/physical/si/current_density.h similarity index 95% rename from src/include/units/physical/si/derived/current_density.h rename to src/include/units/physical/si/current_density.h index 6d6aa907..681977db 100644 --- a/src/include/units/physical/si/derived/current_density.h +++ b/src/include/units/physical/si/current_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/density.h b/src/include/units/physical/si/density.h similarity index 95% rename from src/include/units/physical/si/derived/density.h rename to src/include/units/physical/si/density.h index c469fbec..b2e48998 100644 --- a/src/include/units/physical/si/derived/density.h +++ b/src/include/units/physical/si/density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/dynamic_viscosity.h b/src/include/units/physical/si/dynamic_viscosity.h similarity index 95% rename from src/include/units/physical/si/derived/dynamic_viscosity.h rename to src/include/units/physical/si/dynamic_viscosity.h index 2cff0ae5..d3ee8531 100644 --- a/src/include/units/physical/si/derived/dynamic_viscosity.h +++ b/src/include/units/physical/si/dynamic_viscosity.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/electric_charge.h b/src/include/units/physical/si/electric_charge.h similarity index 95% rename from src/include/units/physical/si/derived/electric_charge.h rename to src/include/units/physical/si/electric_charge.h index 054a4548..0453f8ae 100644 --- a/src/include/units/physical/si/derived/electric_charge.h +++ b/src/include/units/physical/si/electric_charge.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/base/electric_current.h b/src/include/units/physical/si/electric_current.h similarity index 100% rename from src/include/units/physical/si/base/electric_current.h rename to src/include/units/physical/si/electric_current.h diff --git a/src/include/units/physical/si/derived/electric_field_strength.h b/src/include/units/physical/si/electric_field_strength.h similarity index 97% rename from src/include/units/physical/si/derived/electric_field_strength.h rename to src/include/units/physical/si/electric_field_strength.h index de51adb9..72e01aa9 100644 --- a/src/include/units/physical/si/derived/electric_field_strength.h +++ b/src/include/units/physical/si/electric_field_strength.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/energy.h b/src/include/units/physical/si/energy.h similarity index 99% rename from src/include/units/physical/si/derived/energy.h rename to src/include/units/physical/si/energy.h index 351166e5..3410bef4 100644 --- a/src/include/units/physical/si/derived/energy.h +++ b/src/include/units/physical/si/energy.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/derived/energy_density.h b/src/include/units/physical/si/energy_density.h similarity index 95% rename from src/include/units/physical/si/derived/energy_density.h rename to src/include/units/physical/si/energy_density.h index 1f1d2ecd..881acf3a 100644 --- a/src/include/units/physical/si/derived/energy_density.h +++ b/src/include/units/physical/si/energy_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/force.h b/src/include/units/physical/si/force.h similarity index 99% rename from src/include/units/physical/si/derived/force.h rename to src/include/units/physical/si/force.h index 60269e4c..cf51ad72 100644 --- a/src/include/units/physical/si/derived/force.h +++ b/src/include/units/physical/si/force.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/derived/acceleration.h b/src/include/units/physical/si/fps/acceleration.h similarity index 97% rename from src/include/units/physical/si/fps/derived/acceleration.h rename to src/include/units/physical/si/fps/acceleration.h index deb58818..1a03e622 100644 --- a/src/include/units/physical/si/fps/derived/acceleration.h +++ b/src/include/units/physical/si/fps/acceleration.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/derived/area.h b/src/include/units/physical/si/fps/area.h similarity index 97% rename from src/include/units/physical/si/fps/derived/area.h rename to src/include/units/physical/si/fps/area.h index fb1d616a..a9703f20 100644 --- a/src/include/units/physical/si/fps/derived/area.h +++ b/src/include/units/physical/si/fps/area.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/derived/density.h b/src/include/units/physical/si/fps/density.h similarity index 95% rename from src/include/units/physical/si/fps/derived/density.h rename to src/include/units/physical/si/fps/density.h index ba670167..dab3d912 100644 --- a/src/include/units/physical/si/fps/derived/density.h +++ b/src/include/units/physical/si/fps/density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/derived/energy.h b/src/include/units/physical/si/fps/energy.h similarity index 98% rename from src/include/units/physical/si/fps/derived/energy.h rename to src/include/units/physical/si/fps/energy.h index 9284abee..9eb6d0ce 100644 --- a/src/include/units/physical/si/fps/derived/energy.h +++ b/src/include/units/physical/si/fps/energy.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/fps/derived/force.h b/src/include/units/physical/si/fps/force.h similarity index 96% rename from src/include/units/physical/si/fps/derived/force.h rename to src/include/units/physical/si/fps/force.h index b5c887ee..cc53c2fe 100644 --- a/src/include/units/physical/si/fps/derived/force.h +++ b/src/include/units/physical/si/fps/force.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/fps.h b/src/include/units/physical/si/fps/fps.h index 277e00de..61b9350e 100644 --- a/src/include/units/physical/si/fps/fps.h +++ b/src/include/units/physical/si/fps/fps.h @@ -22,16 +22,16 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/include/units/physical/si/fps/base/length.h b/src/include/units/physical/si/fps/length.h similarity index 99% rename from src/include/units/physical/si/fps/base/length.h rename to src/include/units/physical/si/fps/length.h index d35e9f3e..311ab368 100644 --- a/src/include/units/physical/si/fps/base/length.h +++ b/src/include/units/physical/si/fps/length.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/base/mass.h b/src/include/units/physical/si/fps/mass.h similarity index 99% rename from src/include/units/physical/si/fps/base/mass.h rename to src/include/units/physical/si/fps/mass.h index bbf7df3f..ecb405df 100644 --- a/src/include/units/physical/si/fps/base/mass.h +++ b/src/include/units/physical/si/fps/mass.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/derived/power.h b/src/include/units/physical/si/fps/power.h similarity index 98% rename from src/include/units/physical/si/fps/derived/power.h rename to src/include/units/physical/si/fps/power.h index 6cbc71f0..cf7ded79 100644 --- a/src/include/units/physical/si/fps/derived/power.h +++ b/src/include/units/physical/si/fps/power.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/fps/derived/pressure.h b/src/include/units/physical/si/fps/pressure.h similarity index 97% rename from src/include/units/physical/si/fps/derived/pressure.h rename to src/include/units/physical/si/fps/pressure.h index 100c52cd..52a3997f 100644 --- a/src/include/units/physical/si/fps/derived/pressure.h +++ b/src/include/units/physical/si/fps/pressure.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/derived/speed.h b/src/include/units/physical/si/fps/speed.h similarity index 96% rename from src/include/units/physical/si/fps/derived/speed.h rename to src/include/units/physical/si/fps/speed.h index 4e8ab2e5..6763b303 100644 --- a/src/include/units/physical/si/fps/derived/speed.h +++ b/src/include/units/physical/si/fps/speed.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/base/time.h b/src/include/units/physical/si/fps/time.h similarity index 97% rename from src/include/units/physical/si/fps/base/time.h rename to src/include/units/physical/si/fps/time.h index 4aa070d1..d156ed70 100644 --- a/src/include/units/physical/si/fps/base/time.h +++ b/src/include/units/physical/si/fps/time.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/derived/volume.h b/src/include/units/physical/si/fps/volume.h similarity index 98% rename from src/include/units/physical/si/fps/derived/volume.h rename to src/include/units/physical/si/fps/volume.h index 47d3c667..7b4f0396 100644 --- a/src/include/units/physical/si/fps/derived/volume.h +++ b/src/include/units/physical/si/fps/volume.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/derived/frequency.h b/src/include/units/physical/si/frequency.h similarity index 99% rename from src/include/units/physical/si/derived/frequency.h rename to src/include/units/physical/si/frequency.h index 9780af10..21a8daa3 100644 --- a/src/include/units/physical/si/derived/frequency.h +++ b/src/include/units/physical/si/frequency.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/heat_capacity.h b/src/include/units/physical/si/heat_capacity.h similarity index 94% rename from src/include/units/physical/si/derived/heat_capacity.h rename to src/include/units/physical/si/heat_capacity.h index 8b58ff0a..a4f2f2d2 100644 --- a/src/include/units/physical/si/derived/heat_capacity.h +++ b/src/include/units/physical/si/heat_capacity.h @@ -23,10 +23,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/iau/iau.h b/src/include/units/physical/si/iau/iau.h index c6dc24dd..dcaf7e1d 100644 --- a/src/include/units/physical/si/iau/iau.h +++ b/src/include/units/physical/si/iau/iau.h @@ -22,4 +22,4 @@ #pragma once -#include +#include diff --git a/src/include/units/physical/si/iau/base/length.h b/src/include/units/physical/si/iau/length.h similarity index 98% rename from src/include/units/physical/si/iau/base/length.h rename to src/include/units/physical/si/iau/length.h index cedd4ec8..27e558dd 100644 --- a/src/include/units/physical/si/iau/base/length.h +++ b/src/include/units/physical/si/iau/length.h @@ -23,7 +23,7 @@ #pragma once -#include +#include namespace units::physical::si::iau { diff --git a/src/include/units/physical/si/imperial/imperial.h b/src/include/units/physical/si/imperial/imperial.h index 4d442900..ab19db50 100644 --- a/src/include/units/physical/si/imperial/imperial.h +++ b/src/include/units/physical/si/imperial/imperial.h @@ -22,4 +22,4 @@ #pragma once -#include +#include diff --git a/src/include/units/physical/si/imperial/base/length.h b/src/include/units/physical/si/imperial/length.h similarity index 97% rename from src/include/units/physical/si/imperial/base/length.h rename to src/include/units/physical/si/imperial/length.h index 4459f92e..e632b8f9 100644 --- a/src/include/units/physical/si/imperial/base/length.h +++ b/src/include/units/physical/si/imperial/length.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace units::physical::si::imperial { diff --git a/src/include/units/physical/si/derived/inductance.h b/src/include/units/physical/si/inductance.h similarity index 98% rename from src/include/units/physical/si/derived/inductance.h rename to src/include/units/physical/si/inductance.h index 60072f55..42e7460d 100644 --- a/src/include/units/physical/si/derived/inductance.h +++ b/src/include/units/physical/si/inductance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/international/derived/area.h b/src/include/units/physical/si/international/area.h similarity index 94% rename from src/include/units/physical/si/international/derived/area.h rename to src/include/units/physical/si/international/area.h index e34597f5..d36b722d 100644 --- a/src/include/units/physical/si/international/derived/area.h +++ b/src/include/units/physical/si/international/area.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/international.h b/src/include/units/physical/si/international/international.h index 9f9fbf1a..39ab95bc 100644 --- a/src/include/units/physical/si/international/international.h +++ b/src/include/units/physical/si/international/international.h @@ -22,8 +22,8 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include +#include diff --git a/src/include/units/physical/si/international/base/length.h b/src/include/units/physical/si/international/length.h similarity index 99% rename from src/include/units/physical/si/international/base/length.h rename to src/include/units/physical/si/international/length.h index 22138e53..3d6f34b0 100644 --- a/src/include/units/physical/si/international/base/length.h +++ b/src/include/units/physical/si/international/length.h @@ -23,7 +23,7 @@ #pragma once -#include +#include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/derived/speed.h b/src/include/units/physical/si/international/speed.h similarity index 94% rename from src/include/units/physical/si/international/derived/speed.h rename to src/include/units/physical/si/international/speed.h index 40a7d6a0..70cc3f62 100644 --- a/src/include/units/physical/si/international/derived/speed.h +++ b/src/include/units/physical/si/international/speed.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/derived/volume.h b/src/include/units/physical/si/international/volume.h similarity index 94% rename from src/include/units/physical/si/international/derived/volume.h rename to src/include/units/physical/si/international/volume.h index 5f0475c5..11a43ae6 100644 --- a/src/include/units/physical/si/international/derived/volume.h +++ b/src/include/units/physical/si/international/volume.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/base/length.h b/src/include/units/physical/si/length.h similarity index 100% rename from src/include/units/physical/si/base/length.h rename to src/include/units/physical/si/length.h diff --git a/src/include/units/physical/si/derived/luminance.h b/src/include/units/physical/si/luminance.h similarity index 95% rename from src/include/units/physical/si/derived/luminance.h rename to src/include/units/physical/si/luminance.h index 1d205323..d094f166 100644 --- a/src/include/units/physical/si/derived/luminance.h +++ b/src/include/units/physical/si/luminance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/base/luminous_intensity.h b/src/include/units/physical/si/luminous_intensity.h similarity index 100% rename from src/include/units/physical/si/base/luminous_intensity.h rename to src/include/units/physical/si/luminous_intensity.h diff --git a/src/include/units/physical/si/derived/magnetic_flux.h b/src/include/units/physical/si/magnetic_flux.h similarity index 98% rename from src/include/units/physical/si/derived/magnetic_flux.h rename to src/include/units/physical/si/magnetic_flux.h index 14e3f48a..239ebfbe 100644 --- a/src/include/units/physical/si/derived/magnetic_flux.h +++ b/src/include/units/physical/si/magnetic_flux.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/magnetic_induction.h b/src/include/units/physical/si/magnetic_induction.h similarity index 98% rename from src/include/units/physical/si/derived/magnetic_induction.h rename to src/include/units/physical/si/magnetic_induction.h index dadfa162..ead487b8 100644 --- a/src/include/units/physical/si/derived/magnetic_induction.h +++ b/src/include/units/physical/si/magnetic_induction.h @@ -23,9 +23,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/base/mass.h b/src/include/units/physical/si/mass.h similarity index 100% rename from src/include/units/physical/si/base/mass.h rename to src/include/units/physical/si/mass.h diff --git a/src/include/units/physical/si/derived/molar_energy.h b/src/include/units/physical/si/molar_energy.h similarity index 95% rename from src/include/units/physical/si/derived/molar_energy.h rename to src/include/units/physical/si/molar_energy.h index 5915b701..4f347556 100644 --- a/src/include/units/physical/si/derived/molar_energy.h +++ b/src/include/units/physical/si/molar_energy.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/momentum.h b/src/include/units/physical/si/momentum.h similarity index 95% rename from src/include/units/physical/si/derived/momentum.h rename to src/include/units/physical/si/momentum.h index 70f53de4..70542d12 100644 --- a/src/include/units/physical/si/derived/momentum.h +++ b/src/include/units/physical/si/momentum.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/permeability.h b/src/include/units/physical/si/permeability.h similarity index 97% rename from src/include/units/physical/si/derived/permeability.h rename to src/include/units/physical/si/permeability.h index b5a55bff..7fd335f3 100644 --- a/src/include/units/physical/si/derived/permeability.h +++ b/src/include/units/physical/si/permeability.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/derived/permittivity.h b/src/include/units/physical/si/permittivity.h similarity index 97% rename from src/include/units/physical/si/derived/permittivity.h rename to src/include/units/physical/si/permittivity.h index 0a476cf3..3702c05a 100644 --- a/src/include/units/physical/si/derived/permittivity.h +++ b/src/include/units/physical/si/permittivity.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/derived/power.h b/src/include/units/physical/si/power.h similarity index 99% rename from src/include/units/physical/si/derived/power.h rename to src/include/units/physical/si/power.h index 478f59c8..17e323e2 100644 --- a/src/include/units/physical/si/derived/power.h +++ b/src/include/units/physical/si/power.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/include/units/physical/si/derived/pressure.h b/src/include/units/physical/si/pressure.h similarity index 99% rename from src/include/units/physical/si/derived/pressure.h rename to src/include/units/physical/si/pressure.h index 2c7d0e05..c16feb01 100644 --- a/src/include/units/physical/si/derived/pressure.h +++ b/src/include/units/physical/si/pressure.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/radioactivity.h b/src/include/units/physical/si/radioactivity.h similarity index 99% rename from src/include/units/physical/si/derived/radioactivity.h rename to src/include/units/physical/si/radioactivity.h index 78d632f3..95c9a28d 100644 --- a/src/include/units/physical/si/derived/radioactivity.h +++ b/src/include/units/physical/si/radioactivity.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/resistance.h b/src/include/units/physical/si/resistance.h similarity index 98% rename from src/include/units/physical/si/derived/resistance.h rename to src/include/units/physical/si/resistance.h index 772edff1..94e94446 100644 --- a/src/include/units/physical/si/derived/resistance.h +++ b/src/include/units/physical/si/resistance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/si.h b/src/include/units/physical/si/si.h index e398955d..d7c1e528 100644 --- a/src/include/units/physical/si/si.h +++ b/src/include/units/physical/si/si.h @@ -22,53 +22,53 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // TODO Add when downcasting issue is solved (collides with pressure) -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // TODO Add when downcasting issue is solved (collides with frequency) -// #include -#include -#include -#include -#include -#include -#include -#include +// #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/speed.h b/src/include/units/physical/si/speed.h similarity index 96% rename from src/include/units/physical/si/derived/speed.h rename to src/include/units/physical/si/speed.h index b94b5d7d..e34965b2 100644 --- a/src/include/units/physical/si/derived/speed.h +++ b/src/include/units/physical/si/speed.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/surface_tension.h b/src/include/units/physical/si/surface_tension.h similarity index 97% rename from src/include/units/physical/si/derived/surface_tension.h rename to src/include/units/physical/si/surface_tension.h index e2b88644..81934cd3 100644 --- a/src/include/units/physical/si/derived/surface_tension.h +++ b/src/include/units/physical/si/surface_tension.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/derived/thermal_conductivity.h b/src/include/units/physical/si/thermal_conductivity.h similarity index 95% rename from src/include/units/physical/si/derived/thermal_conductivity.h rename to src/include/units/physical/si/thermal_conductivity.h index b43944ec..54449a07 100644 --- a/src/include/units/physical/si/derived/thermal_conductivity.h +++ b/src/include/units/physical/si/thermal_conductivity.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/base/thermodynamic_temperature.h b/src/include/units/physical/si/thermodynamic_temperature.h similarity index 100% rename from src/include/units/physical/si/base/thermodynamic_temperature.h rename to src/include/units/physical/si/thermodynamic_temperature.h diff --git a/src/include/units/physical/si/base/time.h b/src/include/units/physical/si/time.h similarity index 100% rename from src/include/units/physical/si/base/time.h rename to src/include/units/physical/si/time.h diff --git a/src/include/units/physical/si/derived/torque.h b/src/include/units/physical/si/torque.h similarity index 97% rename from src/include/units/physical/si/derived/torque.h rename to src/include/units/physical/si/torque.h index a8ef9baa..2bb4bf74 100644 --- a/src/include/units/physical/si/derived/torque.h +++ b/src/include/units/physical/si/torque.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/include/units/physical/si/typographic/base/length.h b/src/include/units/physical/si/typographic/length.h similarity index 98% rename from src/include/units/physical/si/typographic/base/length.h rename to src/include/units/physical/si/typographic/length.h index 2d27673a..dc9eade9 100644 --- a/src/include/units/physical/si/typographic/base/length.h +++ b/src/include/units/physical/si/typographic/length.h @@ -23,7 +23,7 @@ #pragma once -#include +#include namespace units::physical::si::typographic { diff --git a/src/include/units/physical/si/typographic/typographic.h b/src/include/units/physical/si/typographic/typographic.h index 75fab2a3..994bb64d 100644 --- a/src/include/units/physical/si/typographic/typographic.h +++ b/src/include/units/physical/si/typographic/typographic.h @@ -22,4 +22,4 @@ #pragma once -#include +#include diff --git a/src/include/units/physical/si/us/base/length.h b/src/include/units/physical/si/us/length.h similarity index 98% rename from src/include/units/physical/si/us/base/length.h rename to src/include/units/physical/si/us/length.h index 3a9343f6..0340c960 100644 --- a/src/include/units/physical/si/us/base/length.h +++ b/src/include/units/physical/si/us/length.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace units::physical::si::us { diff --git a/src/include/units/physical/si/us/us.h b/src/include/units/physical/si/us/us.h index 8d96bb6e..fe68840b 100644 --- a/src/include/units/physical/si/us/us.h +++ b/src/include/units/physical/si/us/us.h @@ -22,4 +22,4 @@ #pragma once -#include +#include diff --git a/src/include/units/physical/si/derived/voltage.h b/src/include/units/physical/si/voltage.h similarity index 99% rename from src/include/units/physical/si/derived/voltage.h rename to src/include/units/physical/si/voltage.h index 2f6cc54d..0f84f161 100644 --- a/src/include/units/physical/si/derived/voltage.h +++ b/src/include/units/physical/si/voltage.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/derived/volume.h b/src/include/units/physical/si/volume.h similarity index 99% rename from src/include/units/physical/si/derived/volume.h rename to src/include/units/physical/si/volume.h index b6807e88..9c2ec171 100644 --- a/src/include/units/physical/si/derived/volume.h +++ b/src/include/units/physical/si/volume.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include #include namespace units::physical::si { diff --git a/test/unit_test/runtime/distribution_test.cpp b/test/unit_test/runtime/distribution_test.cpp index 60247180..03c32e21 100644 --- a/test/unit_test/runtime/distribution_test.cpp +++ b/test/unit_test/runtime/distribution_test.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include using namespace units; diff --git a/test/unit_test/runtime/math_test.cpp b/test/unit_test/runtime/math_test.cpp index e741f588..1fc6d777 100644 --- a/test/unit_test/runtime/math_test.cpp +++ b/test/unit_test/runtime/math_test.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include "units/math.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/volume.h" +#include "units/physical/si/area.h" +#include "units/physical/si/volume.h" #include using namespace units; diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp index d560f029..84f3c4e4 100644 --- a/test/unit_test/static/cgs_test.cpp +++ b/test/unit_test/static/cgs_test.cpp @@ -21,16 +21,16 @@ // SOFTWARE. #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/chrono_test.cpp b/test/unit_test/static/chrono_test.cpp index 7359a94f..63418c2d 100644 --- a/test/unit_test/static/chrono_test.cpp +++ b/test/unit_test/static/chrono_test.cpp @@ -22,7 +22,7 @@ #include "test_tools.h" #include -#include +#include #include namespace { diff --git a/test/unit_test/static/concepts_test.cpp b/test/unit_test/static/concepts_test.cpp index 0ad14f3d..ef543520 100644 --- a/test/unit_test/static/concepts_test.cpp +++ b/test/unit_test/static/concepts_test.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/physical/si/cgs/derived/speed.h" -#include "units/physical/si/derived/speed.h" -#include "units/physical/si/fps/derived/speed.h" +#include "units/physical/si/cgs/speed.h" +#include "units/physical/si/speed.h" +#include "units/physical/si/fps/speed.h" #include "units/quantity_point.h" #include "units/chrono.h" #include diff --git a/test/unit_test/static/custom_rep_test_min_expl.cpp b/test/unit_test/static/custom_rep_test_min_expl.cpp index 1b368696..06483dbf 100644 --- a/test/unit_test/static/custom_rep_test_min_expl.cpp +++ b/test/unit_test/static/custom_rep_test_min_expl.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/physical/si/base/length.h" +#include "units/physical/si/length.h" #include namespace { diff --git a/test/unit_test/static/custom_rep_test_min_impl.cpp b/test/unit_test/static/custom_rep_test_min_impl.cpp index ee756551..5d71ed65 100644 --- a/test/unit_test/static/custom_rep_test_min_impl.cpp +++ b/test/unit_test/static/custom_rep_test_min_impl.cpp @@ -21,7 +21,7 @@ // SOFTWARE. #include "units/math.h" -#include "units/physical/si/base/length.h" +#include "units/physical/si/length.h" #include #include #include diff --git a/test/unit_test/static/custom_unit_test.cpp b/test/unit_test/static/custom_unit_test.cpp index cdd4602f..aff34ac1 100644 --- a/test/unit_test/static/custom_unit_test.cpp +++ b/test/unit_test/static/custom_unit_test.cpp @@ -21,10 +21,10 @@ // SOFTWARE. #include "test_tools.h" -#include -#include -#include -#include +#include +#include +#include +#include #include namespace { diff --git a/test/unit_test/static/fps_test.cpp b/test/unit_test/static/fps_test.cpp index 9f33d8eb..5a872a89 100644 --- a/test/unit_test/static/fps_test.cpp +++ b/test/unit_test/static/fps_test.cpp @@ -21,16 +21,16 @@ // SOFTWARE. #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/kind_test.cpp b/test/unit_test/static/kind_test.cpp index 5e102582..5821493d 100644 --- a/test/unit_test/static/kind_test.cpp +++ b/test/unit_test/static/kind_test.cpp @@ -23,9 +23,9 @@ #include "test_tools.h" #include "units/generic/angle.h" #include "units/kind.h" -#include "units/physical/si/base/length.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/speed.h" +#include "units/physical/si/length.h" +#include "units/physical/si/area.h" +#include "units/physical/si/speed.h" using namespace units; using namespace physical::si; diff --git a/test/unit_test/static/math_test.cpp b/test/unit_test/static/math_test.cpp index 364c1355..64cd62f4 100644 --- a/test/unit_test/static/math_test.cpp +++ b/test/unit_test/static/math_test.cpp @@ -22,10 +22,10 @@ #include "units/math.h" #include "test_tools.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/volume.h" -#include "units/physical/si/international/derived/area.h" -#include "units/physical/si/international/derived/volume.h" +#include "units/physical/si/area.h" +#include "units/physical/si/volume.h" +#include "units/physical/si/international/area.h" +#include "units/physical/si/international/volume.h" namespace { diff --git a/test/unit_test/static/quantity_kind_test.cpp b/test/unit_test/static/quantity_kind_test.cpp index 5e50bc06..b8f96d3d 100644 --- a/test/unit_test/static/quantity_kind_test.cpp +++ b/test/unit_test/static/quantity_kind_test.cpp @@ -22,11 +22,11 @@ #include "test_tools.h" #include "units/chrono.h" -#include "units/physical/si/cgs/derived/speed.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/frequency.h" -#include "units/physical/si/derived/speed.h" -#include "units/physical/si/fps/derived/speed.h" +#include "units/physical/si/cgs/speed.h" +#include "units/physical/si/area.h" +#include "units/physical/si/frequency.h" +#include "units/physical/si/speed.h" +#include "units/physical/si/fps/speed.h" #include "units/quantity_point.h" #include "units/quantity_kind.h" #include diff --git a/test/unit_test/static/quantity_point_kind_test.cpp b/test/unit_test/static/quantity_point_kind_test.cpp index ce3b4fa5..616c51bf 100644 --- a/test/unit_test/static/quantity_point_kind_test.cpp +++ b/test/unit_test/static/quantity_point_kind_test.cpp @@ -22,11 +22,11 @@ #include "test_tools.h" #include "units/chrono.h" -#include "units/physical/si/cgs/derived/speed.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/frequency.h" -#include "units/physical/si/derived/speed.h" -#include "units/physical/si/fps/derived/speed.h" +#include "units/physical/si/cgs/speed.h" +#include "units/physical/si/area.h" +#include "units/physical/si/frequency.h" +#include "units/physical/si/speed.h" +#include "units/physical/si/fps/speed.h" #include "units/quantity_point.h" #include "units/quantity_point_kind.h" #include diff --git a/test/unit_test/static/quantity_point_test.cpp b/test/unit_test/static/quantity_point_test.cpp index 1c0815c6..ce2f148a 100644 --- a/test/unit_test/static/quantity_point_test.cpp +++ b/test/unit_test/static/quantity_point_test.cpp @@ -24,10 +24,10 @@ #include "test_tools.h" #include "units/chrono.h" #include "units/math.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/speed.h" -#include "units/physical/si/derived/volume.h" -#include "units/physical/si/us/base/length.h" +#include "units/physical/si/area.h" +#include "units/physical/si/speed.h" +#include "units/physical/si/volume.h" +#include "units/physical/si/us/length.h" #include namespace { diff --git a/test/unit_test/static/quantity_test.cpp b/test/unit_test/static/quantity_test.cpp index 26394d92..287429da 100644 --- a/test/unit_test/static/quantity_test.cpp +++ b/test/unit_test/static/quantity_test.cpp @@ -22,12 +22,12 @@ #include "test_tools.h" #include "units/math.h" -#include "units/physical/si/cgs/derived/speed.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/frequency.h" -#include "units/physical/si/derived/speed.h" -#include "units/physical/si/derived/volume.h" -#include "units/physical/si/fps/derived/speed.h" +#include "units/physical/si/cgs/speed.h" +#include "units/physical/si/area.h" +#include "units/physical/si/frequency.h" +#include "units/physical/si/speed.h" +#include "units/physical/si/volume.h" +#include "units/physical/si/fps/speed.h" #include #include #include diff --git a/test/unit_test/static/si_cgs_test.cpp b/test/unit_test/static/si_cgs_test.cpp index 1bfcba8c..04dd2f44 100644 --- a/test/unit_test/static/si_cgs_test.cpp +++ b/test/unit_test/static/si_cgs_test.cpp @@ -20,26 +20,26 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/si_fps_test.cpp b/test/unit_test/static/si_fps_test.cpp index 22c32b23..d0c2b387 100644 --- a/test/unit_test/static/si_fps_test.cpp +++ b/test/unit_test/static/si_fps_test.cpp @@ -20,26 +20,26 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/unit_constants.cpp b/test/unit_test/static/unit_constants.cpp index 89d82552..7d4bd2f6 100644 --- a/test/unit_test/static/unit_constants.cpp +++ b/test/unit_test/static/unit_constants.cpp @@ -23,11 +23,11 @@ #include "units/bits/external/hacks.h" #include "units/physical/dimensions/length.h" #include "units/physical/dimensions/speed.h" -#include "units/physical/si/base/length.h" -#include "units/physical/si/base/mass.h" -#include "units/physical/si/base/time.h" -#include "units/physical/si/derived/area.h" -#include "units/physical/si/derived/speed.h" +#include "units/physical/si/length.h" +#include "units/physical/si/mass.h" +#include "units/physical/si/time.h" +#include "units/physical/si/area.h" +#include "units/physical/si/speed.h" #include #include #include diff --git a/test/unit_test/static/us_test.cpp b/test/unit_test/static/us_test.cpp index d9c1b5c1..e66bb45f 100644 --- a/test/unit_test/static/us_test.cpp +++ b/test/unit_test/static/us_test.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include namespace { diff --git a/test_package/test_package.cpp b/test_package/test_package.cpp index c3097598..997e0d45 100644 --- a/test_package/test_package.cpp +++ b/test_package/test_package.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include #include