Merge branch 'release/v0.2.3'

.pre-commit-config.yaml

@@ -3,6 +3,10 @@ repos:
  rev: '1.0.1'
  hooks:
  - id: flynt
+- repo: https://github.com/PyCQA/isort
+ rev: '5.12.0'
+ hooks:
+ - id: isort
 - repo: https://github.com/charliermarsh/ruff-pre-commit
  rev: 'v0.0.285'
  hooks:

BIBLIOGRAPHY.bib

@@ -10,6 +10,7 @@ @misc{Brendel2020
  author = {Brendel, Harald},
  year = 2020,
  month = apr,
+ urldate = {2020-09-26},
 }
 @article{Breneman1987b,
  title = {Corresponding Chromaticities for Different States of
@@ -23,6 +24,7 @@ @article{Breneman1987b
  pages = 1115,
  issn = {1084-7529},
  doi = {10.1364/JOSAA.4.001115},
+ urldate = {2014-09-27},
  abstract = {While each of his or her two eyes was independently
  adapted to a different illuminant in viewing a complex visual
  field, each of a number of observers matched a series of test
@@ -132,6 +134,7 @@ @article{Jakob2019
  pages = {147--155},
  issn = {0167-7055, 1467-8659},
  doi = {10.1111/cgf.13626},
+ urldate = {2020-06-21},
  langid = {english},
 }
 @inproceedings{Jiang2013,
@@ -184,6 +187,7 @@ @inproceedings{Langlands2020
  publisher = {{ACM}},
  address = {{Virtual Event USA}},
  doi = {10.1145/3388767.3407368},
+ urldate = {2022-05-28},
  isbn = {978-1-4503-7971-7},
  langid = {english},
 }
@@ -296,6 +300,7 @@ @misc{Luo1997
  title = {Using the {{LUTCHI Colour Appearance Data}}},
  author = {Luo, M Ronnier and Rhodes, Peter A.},
  year = 1997,
+ urldate = {2019-09-10},
  howpublished = {https://web.archive.org/web/20040212195937/http:https://colour.derby.ac.uk:80/colour/info/lutchi/},
 }
 @article{Luo1999,
@@ -308,7 +313,7 @@ @article{Luo1999
  number = 4,
  pages = {295--296},
  issn = {0361-2317},
- doi = {10.1002/(SICI)1520-6378(199908)24:4<295::AID-COL10>3.0.CO;2-K},
+ doi = {10.1002/(SICI)1520-6378(199908)24:4{$<$}295::AID-COL10{$>$}3.0.CO;2-K},
  abstract = {Predicting the binding mode of flexible polypeptides
  to proteins is an important task that falls outside the domain of
  applicability of most small molecule and protein-protein docking
@@ -368,17 +373,27 @@ @misc{Silvennoinen
  author = {Silvennoinen, Raimo and {University of Kuopio}},
  doi = {10.5281/zenodo.3269920},
 }
+@inproceedings{Solomatov2023,
+ title = {Spectral Sensitivity Estimation without a Camera},
+ booktitle = {{{IEEE}} International Conference on Computational
+ Photography ({{ICCP}})},
+ author = {Solomatov, Grigory and Akkaynak, Derya},
+ year = 2023,
+ month = jul,
+}
 @misc{Winquist2022,
  title = {Physlight - {{Camera Spectral Sensitivity Curves}}},
  author = {Winquist, Erik and Thurston, Kimball and {Weta
  Digital}},
  year = 2022,
+ urldate = {2022-05-28},
 }
 @misc{X-Rite2016,
  title = {New Color Specifications for {{ColorChecker SG}} and
  {{Classic Charts}}},
  author = {{X-Rite}},
  year = 2016,
+ urldate = {2018-10-29},
  howpublished = {http:https://xritephoto.com/ph\_product\_overview.aspx?ID=938\&Action=Support\&SupportID=5884\#},
 }
 @misc{Zhao2009,

README.rst

@@ -86,14 +86,15 @@ definition:
  colour-science-datasets
  =======================
 
- Datasets : 22
+ Datasets : 23
  Synced : 1
  URL : https://zenodo.org/communities/colour-science-datasets/
 
  Datasets
  --------
 
  [ ] 3269926 : Agfa IT8.7/2 Set - Marszalec (n.d.)
+ [ ] 8314702 : Camera Dataset - Solomatov and Akkaynak (2023)
  [ ] 3245883 : Camera Spectral Sensitivity Database - Jiang et al. (2013)
  [ ] 3367463 : Constant Hue Loci Data - Hung and Berns (1995)
  [ ] 3362536 : Constant Perceived-Hue Data - Ebner and Fairchild (1998)

colour_datasets/__init__.py

@@ -16,16 +16,14 @@
 """
 
 import contextlib
-import numpy as np
 import os
 import subprocess
 
 import colour
+import numpy as np
 
-from .records import Configuration
-from .records import Community, Record, datasets
-from .records import sandbox
 from .loaders import load
+from .records import Community, Configuration, Record, datasets, sandbox
 
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2019 Colour Developers"
@@ -53,7 +51,7 @@
 
 __major_version__ = "0"
 __minor_version__ = "2"
-__change_version__ = "2"
+__change_version__ = "3"
 __version__ = ".".join(
  (__major_version__, __minor_version__, __change_version__)
 )

colour_datasets/loaders/__init__.py

@@ -19,6 +19,7 @@
 from .labsphere2019 import DatasetLoader_Labsphere2019, build_Labsphere2019
 from .luo1997 import DatasetLoader_Luo1997, build_Luo1997
 from .luo1999 import DatasetLoader_Luo1999, build_Luo1999
+from .solomotav2023 import DatasetLoader_Solomotav2023, build_Solomotav2023
 from .winquist2022 import DatasetLoader_Winquist2022, build_Winquist2022
 from .xrite2016 import DatasetLoader_XRite2016, build_XRite2016
 from .zhao2009 import DatasetLoader_Zhao2009, build_Zhao2009
@@ -70,6 +71,10 @@
  "DatasetLoader_Luo1999",
  "build_Luo1999",
 ]
+__all__ += [
+ "DatasetLoader_Solomotav2023",
+ "build_Solomotav2023",
+]
 __all__ += [
  "DatasetLoader_Winquist2022",
  "build_Winquist2022",
@@ -96,6 +101,7 @@
  DatasetLoader_Labsphere2019.ID: build_Labsphere2019,
  DatasetLoader_Luo1997.ID: build_Luo1997,
  DatasetLoader_Luo1999.ID: build_Luo1999,
+ DatasetLoader_Solomotav2023.ID: build_Solomotav2023,
  DatasetLoader_Winquist2022.ID: build_Winquist2022,
  DatasetLoader_XRite2016.ID: build_XRite2016,
  DatasetLoader_Zhao2009.ID: build_Zhao2009,

colour_datasets/loaders/asano2015.py

@@ -16,15 +16,15 @@
 
 from __future__ import annotations
 
-import numpy as np
 import os
-import xlrd
 from collections import namedtuple
 
+import numpy as np
+import xlrd
 from colour import SpectralShape
 from colour.colorimetry import (
- XYZ_ColourMatchingFunctions,
  LMS_ConeFundamentals,
+ XYZ_ColourMatchingFunctions,
 )
 from colour.hints import Dict, NDArrayFloat
 from colour.utilities import as_float_array, tstack

colour_datasets/loaders/brendel2020.py

@@ -17,10 +17,10 @@
 
 from __future__ import annotations
 
-import numpy as np
 import os
 
-from colour import LinearInterpolator, SpectralShape, SpectralDistribution
+import numpy as np
+from colour import LinearInterpolator, SpectralDistribution, SpectralShape
 from colour.hints import Dict
 from colour.utilities import as_int
 

colour_datasets/loaders/dyer2017.py

@@ -16,8 +16,8 @@
 
 from __future__ import annotations
 
-import json
 import glob
+import json
 import os
 
 from colour import MultiSpectralDistributions, SpectralDistribution

colour_datasets/loaders/ebner1998.py

@@ -19,10 +19,10 @@
 from __future__ import annotations
 
 import codecs
-import numpy as np
 import os
 from collections import namedtuple
 
+import numpy as np
 from colour.hints import Dict, NDArrayFloat
 from colour.utilities import as_float_array
 

colour_datasets/loaders/hung1995.py

@@ -18,10 +18,10 @@
 
 from __future__ import annotations
 
-import numpy as np
 import os
 from collections import namedtuple
 
+import numpy as np
 from colour import CCS_ILLUMINANTS, xy_to_XYZ, xyY_to_XYZ
 from colour.hints import Dict
 

colour_datasets/loaders/jiang2013.py

@@ -19,10 +19,10 @@
 from __future__ import annotations
 
 import codecs
-import numpy as np
 import os
 import re
 
+import numpy as np
 from colour import SpectralShape
 from colour.characterisation import RGB_CameraSensitivities
 from colour.hints import Dict

colour_datasets/loaders/kuopio.py

@@ -37,14 +37,14 @@
 
 import contextlib
 import functools
-import numpy as np
 import os
 import re
-import scipy.io
 import sys
 from collections import namedtuple
 from typing import ClassVar
 
+import numpy as np
+import scipy.io
 from colour import SpectralDistribution, SpectralShape
 from colour.hints import Any, Dict, Tuple, Type, cast
 

colour_datasets/loaders/labsphere2019.py

@@ -14,9 +14,9 @@
  doi:10.5281/zenodo.3245875
 """
 
-import numpy as np
 import os
 
+import numpy as np
 from colour import SpectralDistribution
 from colour.hints import Dict, Optional
 from colour.utilities import tsplit

colour_datasets/loaders/luo1997.py

@@ -31,10 +31,10 @@
 
 from __future__ import annotations
 
-import numpy as np
 import os
 from collections import namedtuple
 
+import numpy as np
 from colour.hints import Dict, Tuple
 from colour.utilities import as_float_array, usage_warning
 

colour_datasets/loaders/luo1999.py

@@ -26,10 +26,10 @@
 from __future__ import annotations
 
 import codecs
-import numpy as np
 import os
 from collections import namedtuple
 
+import numpy as np
 from colour.hints import Dict, Tuple, cast
 from colour.utilities import as_float_array