Skip to content

Commit

Permalink
Merge branch 'feature/v0.4.3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed May 12, 2023
2 parents 6840aa9 + 3a81286 commit 96d9c5d
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion colour/characterisation/aces_it.py
Expand Up @@ -1054,7 +1054,7 @@ def matrix_idt(
"""
Compute an *Input Device Transform* (IDT) matrix for given camera *RGB*
spectral sensitivities, illuminant, training data, standard observer colour
matching functions and optimization settings according to *RAW to ACES* v1
matching functions and optimisation settings according to *RAW to ACES* v1
and *P-2013-001* procedures.
Parameters
Expand Down
2 changes: 1 addition & 1 deletion colour/models/osa_ucs.py
Expand Up @@ -170,7 +170,7 @@ def OSA_UCS_to_XYZ(
--------
There is no analytical inverse transformation from *OSA UCS* to :math:`Ljg`
lightness, jaune (yellowness), and greenness to *CIE XYZ* tristimulus
values, the current implementation relies on optimization using
values, the current implementation relies on optimisation using
:func:`scipy.optimize.fmin` definition and thus has reduced precision and
poor performance.
Expand Down
2 changes: 1 addition & 1 deletion colour/quality/ssi.py
Expand Up @@ -60,7 +60,7 @@ def spectral_similarity_index(
Reference spectral distribution.
round_result
Whether to round the result/output. This is particularly useful when
using SSI in an optimization routine. Default is *True*.
using SSI in an optimisation routine. Default is *True*.
Returns
-------
Expand Down
2 changes: 1 addition & 1 deletion colour/recovery/jakob2019.py
Expand Up @@ -626,7 +626,7 @@ class LUT3D_Jakob2019:
"""
Define a class for working with pre-computed lookup tables for the
*Jakob and Hanika (2019)* spectral upsampling method. It allows significant
time savings by performing the expensive numerical optimization ahead of
time savings by performing the expensive numerical optimisation ahead of
time and storing the results in a file.
The file format is compatible with the code and *\\*.coeff* files in the
Expand Down
2 changes: 1 addition & 1 deletion colour/recovery/meng2015.py
Expand Up @@ -203,7 +203,7 @@ def constraint_function(a: ArrayLike) -> NDArrayFloat:

if not result.success:
raise RuntimeError(
f"Optimization failed for {XYZ} after {result.nit} iterations: "
f"Optimisation failed for {XYZ} after {result.nit} iterations: "
f'"{result.message}".'
)

Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/cie_d.py
Expand Up @@ -66,7 +66,7 @@ def xy_to_CCT_CIE_D(
The *CIE Illuminant D Series* method does not give an analytical inverse
transformation to compute the correlated colour temperature :math:`T_{cp}`
from given *CIE xy* chromaticity coordinates, the current implementation
relies on optimization using :func:`scipy.optimize.minimize` definition and
relies on optimisation using :func:`scipy.optimize.minimize` definition and
thus has reduced precision and poor performance.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/hernandez1999.py
Expand Up @@ -121,7 +121,7 @@ def CCT_to_xy_Hernandez1999(
function and might produce unexpected results. It is given for consistency
with other correlated colour temperature computation methods but should be
avoided for practical applications. The current implementation relies on
optimization using :func:`scipy.optimize.minimize` definition and thus has
optimisation using :func:`scipy.optimize.minimize` definition and thus has
reduced precision and poor performance.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/kang2002.py
Expand Up @@ -64,7 +64,7 @@ def xy_to_CCT_Kang2002(
*Kang et al. (2002)* does not give an analytical inverse transformation to
compute the correlated colour temperature :math:`T_{cp}` from given
*CIE xy* chromaticity coordinates, the current implementation relies on
optimization using :func:`scipy.optimize.minimize` definition and thus has
optimisation using :func:`scipy.optimize.minimize` definition and thus has
reduced precision and poor performance.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/krystek1985.py
Expand Up @@ -65,7 +65,7 @@ def uv_to_CCT_Krystek1985(
*Krystek (1985)* does not give an analytical inverse transformation to
compute the correlated colour temperature :math:`T_{cp}` from given
*CIE UCS* colourspace *uv* chromaticity coordinates, the current
implementation relies on optimization using :func:`scipy.optimize.minimize`
implementation relies on optimisation using :func:`scipy.optimize.minimize`
definition and thus has reduced precision and poor performance.
Notes
Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/mccamy1992.py
Expand Up @@ -104,7 +104,7 @@ def CCT_to_xy_McCamy1992(
might produce unexpected results. It is given for consistency with other
correlated colour temperature computation methods but should be avoided
for practical applications. The current implementation relies on
optimization using :func:`scipy.optimize.minimize` definition and thus has
optimisation using :func:`scipy.optimize.minimize` definition and thus has
reduced precision and poor performance.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/temperature/planck1900.py
Expand Up @@ -70,7 +70,7 @@ def uv_to_CCT_Planck1900(
Warnings
--------
The current implementation relies on optimization using
The current implementation relies on optimisation using
:func:`scipy.optimize.minimize` definition and thus has reduced precision
and poor performance.
Expand Down

0 comments on commit 96d9c5d

Please sign in to comment.