pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing pre-defined distributions for Activity

Browse source
This commit is contained in:
Nicolas Mounet 2021-05-21 11:03:53 +02:00
parent 57c7c78117
commit d76e7a98d5
1 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cara/models.py
View file

@ -37,7 +37,6 @@ import typing
import numpy as np
from scipy.interpolate import interp1d
import scipy.stats as sct
if not typing.TYPE_CHECKING:
from memoization import cached
@ -56,18 +55,6 @@ _VectorisedFloat = typing.Union[float, np.ndarray]
_VectorisedInt = typing.Union[int, np.ndarray]
def _lognormal_distribution(csi: float, lamb: float, samples: int) -> np.ndarray:
"""
Generates a number of samples from a specified lognormal distribution
:param csi: parameter used to specify the lognormal distribution
:param lamb: parameter used to specify the lognormal distribution
:param samples: number of samples to be generated
:return: numpy-array containing the samples
"""
sf_norm = sct.norm.sf(np.random.normal(size=samples))
return sct.lognorm.isf(sf_norm, csi, loc=0, scale=np.exp(lamb))
@dataclass(frozen=True)
class Room:
#: The total volume of the room
@ -545,9 +532,6 @@ class Activity:
#: Pre-populated examples of activities.
types: typing.ClassVar[typing.Dict[str, "Activity"]]
#: Pre-defined examples of activity distributions.
distributions: typing.ClassVar[typing.Dict[str, typing.Callable[[int], "Activity"]]]
Activity.types = {
'Seated': Activity(0.51, 0.51),
@ -557,31 +541,6 @@ Activity.types = {
'Heavy exercise': Activity(3.30, 3.30),
}
@cached
def _generate_activity_distribution(params: typing.Tuple[float, float, int]) -> Activity:
csi, lamb, samples = params
return Activity(
_lognormal_distribution(csi, lamb, samples),
_lognormal_distribution(csi, lamb, samples),
)
Activity.distributions = {
'Seated': lambda n: _generate_activity_distribution((
0.10498338229297108, -0.6872121723362303, n)),
'Standing': lambda n: _generate_activity_distribution((
0.09373162411398223, -0.5742377578494785, n)),
'Light activity': lambda n: _generate_activity_distribution((
0.09435378091059601, 0.21380242785625422, n)),
'Moderate activity': lambda n: _generate_activity_distribution((
0.1894616357138137, 0.551771330362601, n)),
'Heavy exercise': lambda n: _generate_activity_distribution((
0.21744554768657565, 1.1644665696723049, n)),
}
@dataclass(frozen=True)
class Population: