feat: added support for more types

Author: ntamas

src/codegen/run.py

@@ -117,9 +117,11 @@ def generate_enums(  # noqa: C901
         "Adjacency": "AdjacencyMode",
         "AttributeElemtype": "AttributeElementType",
         "BlissSh": "BLISSSplittingHeuristics",
+        "ColoringGreedy": "GreedyColoringHeuristics",
         "Degseq": "DegreeSequenceMode",
         "EdgeorderType": "EdgeOrder",
         "EitType": "EdgeIteratorType",
+        "ErdosRenyi": "ErdosRenyiType",
         "ErrorType": "ErrorCode",
         "EsType": "EdgeSequenceType",
         "FasAlgorithm": "FeedbackArcSetAlgorithm",
@@ -137,8 +139,10 @@ def generate_enums(  # noqa: C901
         "VitType": "VertexIteratorType",
         "VsType": "VertexSequenceType",
     }
-    EXTRA_ENUM_MEMBERS: dict[str, Sequence[tuple[str, int]]] = {
-        "Loops": [("IGNORE", 0)]
+    EXTRA_ENUM_MEMBERS: dict[str, Sequence[tuple[str, Union[int, str]]]] = {
+        "GreedyColoringHeuristics": [("NEIGHBORS", "COLORED_NEIGHBORS")],
+        "LayoutGrid": [("NO_GRID", "NOGRID"), ("AUTO_GRID", "AUTOGRID")],
+        "Loops": [("IGNORE", 0)],
     }
 
     def process_enum(fp: TextIO, spec) -> Optional[str]:  # noqa: C901
@@ -181,6 +185,7 @@ def process_enum(fp: TextIO, spec) -> Optional[str]:  # noqa: C901
 
         last_value = -1
         all_members: dict[str, str] = {}
+        all_values: dict[str, int] = {}
         for entry in entries:
             key, sep, value = entry.replace(" ", "").partition("=")
             if key.startswith("UNUSED_"):
@@ -210,11 +215,18 @@ def process_enum(fp: TextIO, spec) -> Optional[str]:  # noqa: C901
 
             fp.write(f"    {key} = {value_int}\n")
             all_members[key.lower()] = key
+            all_values[key.lower()] = value_int
             last_value = value_int
 
-        for key, value_int in EXTRA_ENUM_MEMBERS.get(name, ()):
+        for key, value_int_or_str in EXTRA_ENUM_MEMBERS.get(name, ()):
+            if isinstance(value_int_or_str, str):
+                value_int = all_members[value_int_or_str.lower()]
+                aliased_to = value_int_or_str
+            else:
+                value_int = value_int_or_str
+                aliased_to = key
             fp.write(f"    {key} = {value_int}\n")
-            all_members[key.lower()] = key
+            all_members[key.lower()] = aliased_to
 
         fp.write("\n")
         fp.write(f"    _string_map: ClassVar[dict[str, {name}]]\n")

src/codegen/types.yaml

@@ -161,6 +161,15 @@ VERTEX_QTYS:
     OUT: "%C% = _Vector.create(0)"
   OUTCONV: "%I% = igraph_vector_t_to_numpy_array(%C%)"
 
+VERTEX_WEIGHTS:
+  PY_TYPE: Iterable[float]
+  PY_RETURN_TYPE: RealArray
+  INCONV:
+    IN: "%C% = vertex_weights_to_igraph_vector_t_view(%I%, %I1%)"
+    INOUT: "%C% = vertex_weights_to_igraph_vector_t(%I%, %I1%)"
+    OUT: "%C% = _Vector.create(0)"
+  OUTCONV: "%I% = igraph_vector_t_to_numpy_array(%C%)"
+
 EDGE:
   PY_TYPE: EdgeLike
   PY_RETURN_TYPE: int
@@ -303,6 +312,11 @@ EIGENALGO:
   INCONV:
     IN: "%C% = c_int(%I%)"
 
+ERDOS_RENYI_TYPE:
+  PY_TYPE: ErdosRenyiType
+  INCONV:
+    IN: "%C% = c_int(%I%)"
+
 FAS_ALGORITHM:
   PY_TYPE: FeedbackArcSetAlgorithm
   INCONV:
@@ -313,11 +327,21 @@ FWALGORITHM:
   INCONV:
     IN: "%C% = c_int(%I%)"
 
+GREEDY_COLORING_HEURISTIC:
+  PY_TYPE: GreedyColoringHeuristics
+  INCONV:
+    IN: "%C% = c_int(%I%)"
+
 IMITATE_ALGORITHM:
   PY_TYPE: ImitateAlgorithm
   INCONV:
     IN: "%C% = c_int(%I%)"
 
+LAYOUT_GRID:
+  PY_TYPE: LayoutGrid
+  INCONV:
+    IN: "%C% = c_int(%I%)"
+
 LOOPS:
   PY_TYPE: Loops
   INCONV:

src/igraph_ctypes/_internal/conversion.py

@@ -157,6 +157,8 @@
     "vertex_colors_to_igraph_vector_t_view",
     "vertex_qtys_to_igraph_vector_t",
     "vertex_qtys_to_igraph_vector_t_view",
+    "vertex_weights_to_igraph_vector_t",
+    "vertex_weights_to_igraph_vector_t_view",
 )
 
 
@@ -776,6 +778,28 @@ def vertex_qtys_to_igraph_vector_t_view(
     return iterable_to_igraph_vector_t_view(weights) if weights else None
 
 
+def vertex_weights_to_igraph_vector_t(
+    weights: Iterable[float], graph: Graph
+) -> _Vector:
+    """Converts a Python iterable of floating-point numbers to a vector of
+    vertex weights.
+    """
+    return iterable_to_igraph_vector_t(weights)
+
+
+def vertex_weights_to_igraph_vector_t_view(
+    weights: Optional[Iterable[float]], graph: Graph
+) -> Optional[_Vector]:
+    """Converts a Python iterable of floating-point numbers to a vector of
+    vertex weights, possibly creating a shallow view if the input is an
+    appropriate NumPy array.
+
+    When the input is `None`, the return value will also be `None`, which is
+    interpreted by the C core of igraph as all vertices having equal weight.
+    """
+    return iterable_to_igraph_vector_t_view(weights) if weights is not None else None
+
+
 ################################################################################
 # Conversion from igraph data types to Python                                  #
 ################################################################################

src/igraph_ctypes/_internal/enums.py

@@ -140,13 +140,14 @@ def from_(cls, value: Any):
 }
 
 
-class ColoringGreedy(IntEnum):
+class GreedyColoringHeuristics(IntEnum):
     """Python counterpart of an ``igraph_coloring_greedy_t`` enum."""
 
     COLORED_NEIGHBORS = 0
     DSATUR = 1
+    NEIGHBORS = COLORED_NEIGHBORS
 
-    _string_map: ClassVar[dict[str, ColoringGreedy]]
+    _string_map: ClassVar[dict[str, GreedyColoringHeuristics]]
 
     @classmethod
     def from_(cls, value: Any):
@@ -155,20 +156,21 @@ def from_(cls, value: Any):
         Raises:
             ValueError: if the object cannot be converted
         """
-        if isinstance(value, ColoringGreedy):
+        if isinstance(value, GreedyColoringHeuristics):
             return value
         elif isinstance(value, int):
             return cls(value)
         else:
             try:
                 return cls._string_map[value]
             except KeyError:
-                raise ValueError(f"{value!r} cannot be converted to ColoringGreedy") from None
+                raise ValueError(f"{value!r} cannot be converted to GreedyColoringHeuristics") from None
 
 
-ColoringGreedy._string_map = {
-    'colored_neighbors': ColoringGreedy.COLORED_NEIGHBORS,
-    'dsatur': ColoringGreedy.DSATUR,
+GreedyColoringHeuristics._string_map = {
+    'colored_neighbors': GreedyColoringHeuristics.COLORED_NEIGHBORS,
+    'dsatur': GreedyColoringHeuristics.DSATUR,
+    'neighbors': GreedyColoringHeuristics.COLORED_NEIGHBORS,
 }
 
 
@@ -820,13 +822,13 @@ def from_(cls, value: Any):
 }
 
 
-class ErdosRenyi(IntEnum):
+class ErdosRenyiType(IntEnum):
     """Python counterpart of an ``igraph_erdos_renyi_t`` enum."""
 
     GNP = 0
     GNM = 1
 
-    _string_map: ClassVar[dict[str, ErdosRenyi]]
+    _string_map: ClassVar[dict[str, ErdosRenyiType]]
 
     @classmethod
     def from_(cls, value: Any):
@@ -835,20 +837,20 @@ def from_(cls, value: Any):
         Raises:
             ValueError: if the object cannot be converted
         """
-        if isinstance(value, ErdosRenyi):
+        if isinstance(value, ErdosRenyiType):
             return value
         elif isinstance(value, int):
             return cls(value)
         else:
             try:
                 return cls._string_map[value]
             except KeyError:
-                raise ValueError(f"{value!r} cannot be converted to ErdosRenyi") from None
+                raise ValueError(f"{value!r} cannot be converted to ErdosRenyiType") from None
 
 
-ErdosRenyi._string_map = {
-    'gnm': ErdosRenyi.GNM,
-    'gnp': ErdosRenyi.GNP,
+ErdosRenyiType._string_map = {
+    'gnm': ErdosRenyiType.GNM,
+    'gnp': ErdosRenyiType.GNP,
 }
 
 
@@ -1540,6 +1542,8 @@ class LayoutGrid(IntEnum):
     GRID = 0
     NOGRID = 1
     AUTOGRID = 2
+    NO_GRID = NOGRID
+    AUTO_GRID = AUTOGRID
 
     _string_map: ClassVar[dict[str, LayoutGrid]]
 
@@ -1562,8 +1566,10 @@ def from_(cls, value: Any):
 
 
 LayoutGrid._string_map = {
+    'auto_grid': LayoutGrid.AUTOGRID,
     'autogrid': LayoutGrid.AUTOGRID,
     'grid': LayoutGrid.GRID,
+    'no_grid': LayoutGrid.NOGRID,
     'nogrid': LayoutGrid.NOGRID,
 }
 
@@ -2072,7 +2078,6 @@ def from_(cls, value: Any):
     'AttributeType',
     'BLISSSplittingHeuristics',
     'BarabasiAlgorithm',
-    'ColoringGreedy',
     'CommunityComparison',
     'Connectedness',
     'DRLLayoutPreset',
@@ -2081,12 +2086,13 @@ def from_(cls, value: Any):
     'EdgeOrder',
     'EdgeSequenceType',
     'EigenAlgorithm',
-    'ErdosRenyi',
+    'ErdosRenyiType',
     'ErrorCode',
     'FeedbackArcSetAlgorithm',
     'FileFormat',
     'FloydWarshallAlgorithm',
     'GetAdjacency',
+    'GreedyColoringHeuristics',
     'ImitateAlgorithm',
     'LaplacianNormalization',
     'LaplacianSpectralEmbeddingType',