Skip to content

Commit 96d9c5d

Browse files
committed
Merge branch 'feature/v0.4.3' into develop
2 parents 6840aa9 + 3a81286 commit 96d9c5d

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

colour/characterisation/aces_it.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ def matrix_idt(
10541054
"""
10551055
Compute an *Input Device Transform* (IDT) matrix for given camera *RGB*
10561056
spectral sensitivities, illuminant, training data, standard observer colour
1057-
matching functions and optimization settings according to *RAW to ACES* v1
1057+
matching functions and optimisation settings according to *RAW to ACES* v1
10581058
and *P-2013-001* procedures.
10591059
10601060
Parameters

colour/models/osa_ucs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def OSA_UCS_to_XYZ(
170170
--------
171171
There is no analytical inverse transformation from *OSA UCS* to :math:`Ljg`
172172
lightness, jaune (yellowness), and greenness to *CIE XYZ* tristimulus
173-
values, the current implementation relies on optimization using
173+
values, the current implementation relies on optimisation using
174174
:func:`scipy.optimize.fmin` definition and thus has reduced precision and
175175
poor performance.
176176

colour/quality/ssi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def spectral_similarity_index(
6060
Reference spectral distribution.
6161
round_result
6262
Whether to round the result/output. This is particularly useful when
63-
using SSI in an optimization routine. Default is *True*.
63+
using SSI in an optimisation routine. Default is *True*.
6464
6565
Returns
6666
-------

colour/recovery/jakob2019.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ class LUT3D_Jakob2019:
626626
"""
627627
Define a class for working with pre-computed lookup tables for the
628628
*Jakob and Hanika (2019)* spectral upsampling method. It allows significant
629-
time savings by performing the expensive numerical optimization ahead of
629+
time savings by performing the expensive numerical optimisation ahead of
630630
time and storing the results in a file.
631631
632632
The file format is compatible with the code and *\\*.coeff* files in the

colour/recovery/meng2015.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def constraint_function(a: ArrayLike) -> NDArrayFloat:
203203

204204
if not result.success:
205205
raise RuntimeError(
206-
f"Optimization failed for {XYZ} after {result.nit} iterations: "
206+
f"Optimisation failed for {XYZ} after {result.nit} iterations: "
207207
f'"{result.message}".'
208208
)
209209

colour/temperature/cie_d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def xy_to_CCT_CIE_D(
6666
The *CIE Illuminant D Series* method does not give an analytical inverse
6767
transformation to compute the correlated colour temperature :math:`T_{cp}`
6868
from given *CIE xy* chromaticity coordinates, the current implementation
69-
relies on optimization using :func:`scipy.optimize.minimize` definition and
69+
relies on optimisation using :func:`scipy.optimize.minimize` definition and
7070
thus has reduced precision and poor performance.
7171
7272
References

colour/temperature/hernandez1999.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def CCT_to_xy_Hernandez1999(
121121
function and might produce unexpected results. It is given for consistency
122122
with other correlated colour temperature computation methods but should be
123123
avoided for practical applications. The current implementation relies on
124-
optimization using :func:`scipy.optimize.minimize` definition and thus has
124+
optimisation using :func:`scipy.optimize.minimize` definition and thus has
125125
reduced precision and poor performance.
126126
127127
References

colour/temperature/kang2002.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def xy_to_CCT_Kang2002(
6464
*Kang et al. (2002)* does not give an analytical inverse transformation to
6565
compute the correlated colour temperature :math:`T_{cp}` from given
6666
*CIE xy* chromaticity coordinates, the current implementation relies on
67-
optimization using :func:`scipy.optimize.minimize` definition and thus has
67+
optimisation using :func:`scipy.optimize.minimize` definition and thus has
6868
reduced precision and poor performance.
6969
7070
References

colour/temperature/krystek1985.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def uv_to_CCT_Krystek1985(
6565
*Krystek (1985)* does not give an analytical inverse transformation to
6666
compute the correlated colour temperature :math:`T_{cp}` from given
6767
*CIE UCS* colourspace *uv* chromaticity coordinates, the current
68-
implementation relies on optimization using :func:`scipy.optimize.minimize`
68+
implementation relies on optimisation using :func:`scipy.optimize.minimize`
6969
definition and thus has reduced precision and poor performance.
7070
7171
Notes

colour/temperature/mccamy1992.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def CCT_to_xy_McCamy1992(
104104
might produce unexpected results. It is given for consistency with other
105105
correlated colour temperature computation methods but should be avoided
106106
for practical applications. The current implementation relies on
107-
optimization using :func:`scipy.optimize.minimize` definition and thus has
107+
optimisation using :func:`scipy.optimize.minimize` definition and thus has
108108
reduced precision and poor performance.
109109
110110
References

0 commit comments

Comments
 (0)