update color sequence interpolation architecture

include/pysicgl/submodules/color.h

@@ -2,5 +2,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyMODINIT_FUNC PyInit_color(void);

include/pysicgl/submodules/composition.h

@@ -2,5 +2,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyMODINIT_FUNC PyInit_composition(void);

include/pysicgl/submodules/functional.h

@@ -2,5 +2,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyMODINIT_FUNC PyInit_functional(void);

include/pysicgl/submodules/functional/color.h

@@ -1,5 +1,8 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* color_from_rgba(PyObject* self, PyObject* args);
 PyObject* color_to_rgba(PyObject* self, PyObject* args);
+PyObject* interpolate_color_sequence(
+    PyObject* self_in, PyObject* args, PyObject* kwds);

include/pysicgl/submodules/functional/color_correction.h

@@ -1,4 +1,5 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* gamma_correct(PyObject* self, PyObject* args);

include/pysicgl/submodules/functional/drawing/global.h

@@ -2,6 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* global_pixel(PyObject* self_in, PyObject* args);
 PyObject* global_line(PyObject* self_in, PyObject* args);

include/pysicgl/submodules/functional/drawing/interface.h

@@ -2,6 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* interface_compose(PyObject* self_in, PyObject* args);
 PyObject* interface_blit(PyObject* self_in, PyObject* args);

include/pysicgl/submodules/functional/drawing/screen.h

@@ -2,6 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* screen_fill(PyObject* self_in, PyObject* args);
 PyObject* screen_pixel(PyObject* self_in, PyObject* args);

include/pysicgl/submodules/functional/operations.h

@@ -1,5 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyObject* scalar_field(PyObject* self_in, PyObject* args, PyObject* kwds);
 PyObject* compose(PyObject* self_in, PyObject* args);

include/pysicgl/submodules/interpolation.h

@@ -2,5 +2,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 PyMODINIT_FUNC PyInit_interpolation(void);

include/pysicgl/types/color_sequence.h

@@ -2,14 +2,17 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
+#include "pysicgl/types/color_sequence_interpolator.h"
 #include "sicgl/color_sequence.h"
 
 // declare the type
 extern PyTypeObject ColorSequenceType;
 
 typedef struct {
   PyObject_HEAD color_sequence_t sequence;
+  ColorSequenceInterpolatorObject* interpolator;
 
   // iterator state
   // protected by the GIL

include/pysicgl/types/color_sequence_interpolator.h

@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "sicgl/color_sequence.h"
 

include/pysicgl/types/compositor.h

@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include <stdbool.h>
 

include/pysicgl/types/interface.h

@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/types/screen.h"
 #include "sicgl/interface.h"

include/pysicgl/types/scalar_field.h

@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "sicgl/field.h"
 

include/pysicgl/types/screen.h

@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include <stdbool.h>
 

src/module.c

@@ -1,6 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/submodules/color.h"
 #include "pysicgl/submodules/composition.h"

src/submodules/composition/module.c

@@ -1,6 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/types/compositor.h"
 #include "sicgl/compositors.h"

src/submodules/functional/color.c

@@ -1,7 +1,9 @@
 #define PY_SSIZE_T_CLEAN
-#include "sicgl/color.h"
-
 #include <Python.h>
+// python includes first (clang-format)
+
+#include "pysicgl/types/color_sequence.h"
+#include "sicgl/color.h"
 
 PyObject* color_to_rgba(PyObject* self, PyObject* args) {
   (void)self;
@@ -31,3 +33,96 @@ PyObject* color_from_rgba(PyObject* self, PyObject* args) {
       PyLong_AsLong(PyTuple_GetItem(obj, 2)),
       PyLong_AsLong(PyTuple_GetItem(obj, 3))));
 }
+
+PyObject* interpolate_color_sequence(
+    PyObject* self_in, PyObject* args, PyObject* kwds) {
+  (void)self_in;
+  int ret = 0;
+  ColorSequenceObject* color_sequence_obj;
+  PyObject* samples_obj;
+  char* keywords[] = {
+      "color_sequence",
+      "samples",
+      NULL,
+  };
+  if (!PyArg_ParseTupleAndKeywords(
+          args, kwds, "O!O", keywords, &ColorSequenceType, &color_sequence_obj,
+          &samples_obj)) {
+    return NULL;
+  }
+
+  // determine the interpolation function
+  sequence_map_fn interp_fn = color_sequence_obj->interpolator->fn;
+
+  // use this sequences' interpolation method to handle the input
+  if (PyLong_Check(samples_obj)) {
+    // input is a single sample, return the interpolated color directly
+    color_t color;
+    ret = interp_fn(
+        &color_sequence_obj->sequence, (double)PyLong_AsLong(samples_obj),
+        &color);
+    if (0 != ret) {
+      PyErr_SetNone(PyExc_OSError);
+      return NULL;
+    }
+    return PyLong_FromLong(color);
+
+  } else if (PyFloat_Check(samples_obj)) {
+    // input is a single sample, return the interpolated color directly
+    color_t color;
+    ret = interp_fn(
+        &color_sequence_obj->sequence, PyFloat_AsDouble(samples_obj), &color);
+    if (0 != ret) {
+      PyErr_SetNone(PyExc_OSError);
+      return NULL;
+    }
+    return PyLong_FromLong(color);
+
+  } else if (PyList_Check(samples_obj)) {
+    // input is a list of samples, return a tuple of interpolated colors
+    size_t num_samples = PyList_Size(samples_obj);
+    PyObject* result = PyTuple_New(num_samples);
+    for (size_t idx = 0; idx < num_samples; idx++) {
+      color_t color;
+      ret = interp_fn(
+          &color_sequence_obj->sequence,
+          PyFloat_AsDouble(PyList_GetItem(samples_obj, idx)), &color);
+      if (0 != ret) {
+        PyErr_SetNone(PyExc_OSError);
+        return NULL;
+      }
+      ret = PyTuple_SetItem(result, idx, PyLong_FromLong(color));
+      if (0 != ret) {
+        return NULL;
+      }
+    }
+    return result;
+
+  } else if (PyTuple_Check(samples_obj)) {
+    // input is a tuple of samples, return a tuple of interpolated colors
+    size_t num_samples = PyTuple_Size(samples_obj);
+    PyObject* result = PyTuple_New(num_samples);
+    for (size_t idx = 0; idx < num_samples; idx++) {
+      color_t color;
+      ret = interp_fn(
+          &color_sequence_obj->sequence,
+          PyFloat_AsDouble(PyTuple_GetItem(samples_obj, idx)), &color);
+      if (0 != ret) {
+        PyErr_SetNone(PyExc_OSError);
+        return NULL;
+      }
+      ret = PyTuple_SetItem(result, idx, PyLong_FromLong(color));
+      if (0 != ret) {
+        return NULL;
+      }
+    }
+
+  } else {
+    PyErr_SetNone(PyExc_TypeError);
+    return NULL;
+  }
+
+  // should never get here
+  PyErr_SetNone(PyExc_NotImplementedError);
+  return NULL;
+}

src/submodules/functional/color_correction.c

@@ -1,5 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 #include "pysicgl/types/interface.h"
 #include "sicgl/gamma.h"

src/submodules/functional/drawing/global.c

@@ -1,10 +1,10 @@
 #define PY_SSIZE_T_CLEAN
-#include "sicgl/domain/global.h"
-
 #include <Python.h>
+// python includes first (clang-format)
 
 #include "pysicgl/types/interface.h"
 #include "sicgl/blit.h"
+#include "sicgl/domain/global.h"
 
 PyObject* global_pixel(PyObject* self_in, PyObject* args) {
   (void)self_in;

src/submodules/functional/drawing/interface.c

@@ -1,6 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/types/interface.h"
 #include "sicgl/blit.h"

src/submodules/functional/drawing/screen.c

@@ -1,6 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/types/interface.h"
 #include "sicgl/domain/screen.h"

src/submodules/functional/module.c

@@ -1,5 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 #include "pysicgl/submodules/functional/color.h"
 #include "pysicgl/submodules/functional/color_correction.h"
@@ -79,6 +80,10 @@ static PyMethodDef funcs[] = {
      "Return the color comprised of the RGBA input 4-tuple."},
     {"color_to_rgba", (PyCFunction)color_to_rgba, METH_VARARGS,
      "Return the individual RGBA components of the input color as a 4-tuple."},
+    {"interpolate_color_sequence", (PyCFunction)interpolate_color_sequence,
+     METH_VARARGS | METH_KEYWORDS,
+     "Interpolate the color sequence at one or more points using the given "
+     "interpolation type."},
 
     // color correction
     {"gamma_correct", (PyCFunction)gamma_correct, METH_VARARGS,

src/submodules/functional/operations.c

@@ -1,5 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+// python includes first (clang-format)
 
 #include "pysicgl/types/color_sequence.h"
 #include "pysicgl/types/color_sequence_interpolator.h"
@@ -36,22 +37,18 @@ PyObject* scalar_field(PyObject* self_in, PyObject* args, PyObject* kwds) {
   ScreenObject* field_obj;
   ScalarFieldObject* scalar_field_obj;
   ColorSequenceObject* color_sequence_obj;
-  ColorSequenceInterpolatorObject* interpolator_obj;
   double offset = 0.0;
   char* keywords[] = {
-      "interface",    "field",  "scalars", "color_sequence",
-      "interpolator", "offset", NULL,
+      "interface", "screen", "scalar_field", "color_sequence", "offset", NULL,
   };
   if (!PyArg_ParseTupleAndKeywords(
-          args, kwds, "O!O!O!O!O!|d", keywords, &InterfaceType, &interface_obj,
+          args, kwds, "O!O!O!O!|d", keywords, &InterfaceType, &interface_obj,
           &ScreenType, &field_obj, &ScalarFieldType, &scalar_field_obj,
-          &ColorSequenceType, &color_sequence_obj,
-          &ColorSequenceInterpolatorType, &interpolator_obj, &offset)) {
+          &ColorSequenceType, &color_sequence_obj, &offset)) {
     return NULL;
   }
 
   Py_INCREF(color_sequence_obj);
-  Py_INCREF(interpolator_obj);
   Py_INCREF(scalar_field_obj);
 
   // check length of scalars is sufficient for the field
@@ -68,6 +65,8 @@ PyObject* scalar_field(PyObject* self_in, PyObject* args, PyObject* kwds) {
     return NULL;
   }
 
+  ColorSequenceInterpolatorObject* interpolator_obj =
+      color_sequence_obj->interpolator;
   ret = sicgl_scalar_field(
       &interface_obj->interface, field_obj->screen, scalar_field_obj->scalars,
       offset, &color_sequence_obj->sequence, interpolator_obj->fn);
@@ -77,7 +76,6 @@ PyObject* scalar_field(PyObject* self_in, PyObject* args, PyObject* kwds) {
   }
 
   Py_DECREF(scalar_field_obj);
-  Py_DECREF(interpolator_obj);
   Py_DECREF(color_sequence_obj);
 
   Py_INCREF(Py_None);

src/submodules/interpolation/module.c

@@ -1,6 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-// python includes must come first
+// python includes first (clang-format)
 
 #include "pysicgl/types/color_sequence_interpolator.h"
 #include "sicgl/color_sequence.h"