Skip to content

Commit

Permalink
Rename ".*matrix.*" objects in "colour.appearance" sub-package.
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Oct 3, 2020
1 parent c3e4faf commit 9a8e794
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions colour/appearance/cam16.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
opponent_colour_dimensions_forward, opponent_colour_dimensions_inverse,
post_adaptation_non_linear_response_compression_forward,
post_adaptation_non_linear_response_compression_inverse,
post_adaptation_non_linear_response_compression_matrix,
matrix_post_adaptation_non_linear_response_compression,
saturation_correlate, temporary_magnitude_quantity_inverse,
viewing_condition_dependent_parameters)
from colour.utilities import (CaseInsensitiveMapping, as_float_array,
Expand Down Expand Up @@ -463,7 +463,7 @@ def CAM16_to_XYZ(specification,

# Step 4
# Computing post-adaptation non linear response compression matrix.
RGB_a = post_adaptation_non_linear_response_compression_matrix(P_2, a, b)
RGB_a = matrix_post_adaptation_non_linear_response_compression(P_2, a, b)

# Step 5
# Applying inverse post-adaptation non linear response compression.
Expand Down
10 changes: 5 additions & 5 deletions colour/appearance/ciecam02.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
'temporary_magnitude_quantity_forward',
'temporary_magnitude_quantity_inverse', 'chroma_correlate',
'colourfulness_correlate', 'saturation_correlate', 'P',
'post_adaptation_non_linear_response_compression_matrix'
'matrix_post_adaptation_non_linear_response_compression'
]

CAT02_INVERSE_CAT = np.linalg.inv(CAT_CAT02)
Expand Down Expand Up @@ -506,7 +506,7 @@ def CIECAM02_to_XYZ(specification,
a, b = tsplit(opponent_colour_dimensions_inverse(P_n, h))

# Computing post-adaptation non linear response compression matrix.
RGB_a = post_adaptation_non_linear_response_compression_matrix(P_2, a, b)
RGB_a = matrix_post_adaptation_non_linear_response_compression(P_2, a, b)

# Applying inverse post-adaptation non linear response compression.
RGB_p = post_adaptation_non_linear_response_compression_inverse(RGB_a, F_L)
Expand Down Expand Up @@ -1500,9 +1500,9 @@ def P(N_c, N_cb, e_t, t, A, N_bb):
return P_n


def post_adaptation_non_linear_response_compression_matrix(P_2, a, b):
def matrix_post_adaptation_non_linear_response_compression(P_2, a, b):
"""
Returns the post adaptation non linear response compression matrix.
Returns the post-adaptation non-linear-response compression matrix.
Parameters
----------
Expand All @@ -1523,7 +1523,7 @@ def post_adaptation_non_linear_response_compression_matrix(P_2, a, b):
>>> P_2 = 24.2372054671
>>> a = -0.000624112068243
>>> b = -0.000506270106773
>>> post_adaptation_non_linear_response_compression_matrix(P_2, a, b)
>>> matrix_post_adaptation_non_linear_response_compression(P_2, a, b)
... # doctest: +ELLIPSIS
array([ 7.9463202..., 7.9471152..., 7.9489959...])
"""
Expand Down

0 comments on commit 9a8e794

Please sign in to comment.