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 7, 2023
2 parents 50399c1 + e97e265 commit 95592e5
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions colour/characterisation/aces_it.py
Expand Up @@ -822,7 +822,7 @@ def optimisation_factory_rawtoaces_v1() -> (
Examples
--------
>>> optimisation_factory_rawtoaces_v1() # doctest: +SKIP
(array([1, 0, 0, 1, 0, 0]), \
(array([ 1., 0., 0., 1., 0., 0.]), \
<function optimisation_factory_rawtoaces_v1.<locals> \
.objective_function at 0x...>, \
<function optimisation_factory_rawtoaces_v1.<locals>\
Expand All @@ -831,7 +831,7 @@ def optimisation_factory_rawtoaces_v1() -> (
.finaliser_function at 0x...>)
"""

x_0 = np.array([1, 0, 0, 1, 0, 0])
x_0 = as_float_array([1, 0, 0, 1, 0, 0])

def objective_function(
M: NDArrayFloat, RGB: NDArrayFloat, Lab: NDArrayFloat
Expand Down Expand Up @@ -892,7 +892,7 @@ def optimisation_factory_Jzazbz() -> (
Examples
--------
>>> optimisation_factory_Jzazbz() # doctest: +SKIP
(array([1, 0, 0, 1, 0, 0]), \
(array([ 1., 0., 0., 1., 0., 0.]), \
<function optimisation_factory_Jzazbz.<locals>\
.objective_function at 0x...>, \
<function optimisation_factory_Jzazbz.<locals>\
Expand All @@ -901,7 +901,7 @@ def optimisation_factory_Jzazbz() -> (
finaliser_function at 0x...>)
"""

x_0 = np.array([1, 0, 0, 1, 0, 0])
x_0 = as_float_array([1, 0, 0, 1, 0, 0])

def objective_function(
M: ArrayLike, RGB: ArrayLike, Jab: ArrayLike
Expand Down Expand Up @@ -966,7 +966,8 @@ def optimisation_factory_Oklab_15() -> (
Examples
--------
>>> optimisation_factory_Oklab_15() # doctest: +SKIP
(array([1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1]), \
(array([ 1., 0., 0., 0., 0., 0., 0., 1., 0., 0., 0., 0., 0., \
0., 1.]), \
<function optimisation_factory_Oklab_15.<locals>\
.objective_function at 0x...>, \
<function optimisation_factory_Oklab_15.<locals>\
Expand All @@ -975,7 +976,7 @@ def optimisation_factory_Oklab_15() -> (
finaliser_function at 0x...>)
"""

x_0 = np.array([1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1])
x_0 = as_float_array([1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1])

def objective_function(
M: ArrayLike, RGB: ArrayLike, Jab: ArrayLike
Expand Down

0 comments on commit 95592e5

Please sign in to comment.