feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

fix: luminous flux support fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2022-09-01 12:18:18 +02:00
parent e40a5d631c
commit 1096d8d8ba
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/systems/isq/include/units/isq/dimensions/luminous_flux.h
View File

@@ -23,12 +23,16 @@
#pragma once #pragma once
#include <units/concepts.h> #include <units/concepts.h>
#include <units/isq/dimensions/power.h> #include <units/generic/solid_angle.h>
#include <units/isq/dimensions/luminous_intensity.h>
namespace units::isq { namespace units::isq {
template<typename Child, Unit U, typename... Dims> template<typename Child, Unit U, typename...>
using dim_luminous_flux = dim_power<Child, U, Dims...>; struct dim_luminous_flux;
template<typename Child, Unit U, DimensionOfT<dim_luminous_intensity> I, DimensionOfT<dim_solid_angle> A>
struct dim_luminous_flux<Child, U, I, A> : derived_dimension<Child, U, exponent<I, 1>, exponent<A, 1>> {};
template<typename T> template<typename T>
concept LuminousFlux = QuantityOfT<T, dim_luminous_flux>; concept LuminousFlux = QuantityOfT<T, dim_luminous_flux>;

13
src/systems/si/include/units/isq/si/luminous_flux.h
View File

@@ -23,25 +23,26 @@
#pragma once #pragma once
// IWYU pragma: begin_exports // IWYU pragma: begin_exports
#include <units/isq/si/power.h> #include <units/isq/dimensions/luminous_flux.h>
#include <units/isq/si/luminous_intensity.h>
#include <units/quantity.h> #include <units/quantity.h>
#include <units/reference.h> #include <units/reference.h>
#include <units/symbol_text.h> #include <units/symbol_text.h>
// IWYU pragma: end_exports // IWYU pragma: end_exports
#include <units/generic/solid_angle.h>
#include <units/isq/si/prefixes.h> #include <units/isq/si/prefixes.h>
#include <units/unit.h> #include <units/unit.h>
namespace units::isq::si { namespace units::isq::si {
// TODO Is this correct? Should we account for steradian here? How? struct lumen : named_unit<lumen, "lm"> {};
struct lumen : named_scaled_unit<lumen, "lm", mag<ratio(1, 683)>(), watt> {}; struct dim_luminous_flux :
isq::dim_luminous_flux<dim_luminous_flux, lumen, dim_luminous_intensity, dim_solid_angle<>> {};
using dim_luminous_flux = dim_power;
template<UnitOf<dim_luminous_flux> U, Representation Rep = double> template<UnitOf<dim_luminous_flux> U, Representation Rep = double>
using luminous_flux = power<U, Rep>; using luminous_flux = quantity<dim_luminous_flux, U, Rep>;
#ifndef UNITS_NO_LITERALS #ifndef UNITS_NO_LITERALS

3
test/unit_test/static/si_test.cpp
View File

@@ -241,8 +241,7 @@ static_assert(kilogray::symbol == "kGy");
// luminous flux // luminous flux
static_assert(683_q_lm == 1_q_W); static_assert(1_q_sr * 1_q_cd == 1_q_lm);
static_assert(lumen::symbol == "lm"); static_assert(lumen::symbol == "lm");
/* ************** DERIVED DIMENSIONS IN TERMS OF BASE UNITS **************** */ /* ************** DERIVED DIMENSIONS IN TERMS OF BASE UNITS **************** */