Moved named tuple init in pyrpn module and declaration in python_const

python_const.c

@@ -11,6 +11,96 @@ PyModuleDef rpnconstmodule = {
 	NULL
 };
 
+/* Various named tuple definition, instanciated in python_rpnexpr module init */
+static PyStructSequence_Field params_fields[] = {
+	{	.name = "pos_flag",
+		.doc = "Position flag, indicating coordinate system",
+	},
+	{	.name =  "res_flag",
+		.doc = "Result flag, indicate how to handle expr results",
+	},
+	{	.name = "size_lim",
+		.doc = "Size limit, an array indicating the space size (depends \
+on pos_flag",
+	},
+	{
+		.name = "const_values",
+		.doc = "Constant values to use when setting value in space \
+(expr gives the position, and we set this value",
+	},
+	{ NULL, NULL },
+};
+PyStructSequence_Desc rpnif_params_desc = {
+	.name = "RPNIterParams",
+	.doc = "Named tuple for RPNIter parameters",
+	.n_in_sequence = (sizeof(params_fields) / sizeof(*params_fields))-1,
+	.fields = params_fields,
+};
+PyTypeObject rpnif_params_SeqDesc;
+
+static PyStructSequence_Field token_types_fields[] = {
+	{	.name = "op",
+		.doc = "Operation",
+	},
+	{	.name = "const",
+		.doc = "Constant value",
+	},
+	{	.name = "var",
+		.doc = "Variable (argument)",
+	},
+};
+PyStructSequence_Desc rpn_token_types_desc = {
+	.name = "RPNTokenTypes",
+	.doc = "Named tuple with token types as keys",
+	.n_in_sequence = 3,
+	.fields = token_types_fields,
+};
+PyTypeObject rpn_token_types_SeqDesc;
+
+static PyStructSequence_Field mutation_params_fields[] = {
+	{	.name = "minimum_length",
+		.doc = "Expression minimum length",
+	},
+	{	.name =  "weight_add",
+		.doc = "The weight for 'add token' mutation",
+	},
+	{	.name = "weight_del",
+		.doc = "The weight for 'delete token' mutation",
+	},
+	{	.name = "weight_mut",
+		.doc = "The weight for 'mutate token' mutation",
+	},
+	{	.name = "weight_mut_soft",
+		.doc = "The weight for 'mutate soft (value not type) token' mutation",
+	},
+	{
+		.name = "weight_add_elt",
+		.doc = "The weights for each token types when adding a token",
+	},
+	{
+		.name = "weight_del_elt",
+		.doc= "The weights for each token types when deleting a token",
+	}
+};
+PyStructSequence_Desc rpn_mutation_params_desc = {
+	.name = "RPNMutationParams",
+	.doc = "Named tuple for mutation parameters",
+	.n_in_sequence = (sizeof(mutation_params_fields) / sizeof(*mutation_params_fields)),
+	.fields = mutation_params_fields,
+};
+PyTypeObject rpn_mutation_params_SeqDesc;
+
+
+rpn_mutation_params_t rpn_mutation_params_default = {
+	.min_len = 3,
+	.w_add = 1.25,
+	.w_del = 1.0,
+	.w_mut = 2.0,
+	.w_mut_soft = 4.0,
+	.w_add_elt = {1.0,1.0,1.0},
+	.w_mut_elt = {1.0,1.0,1.0},
+};
+
 int Py_rpnconst_add(PyObject* mod, const char* name, int value)
 {
 	PyObject *val;
@@ -30,6 +120,8 @@ PyObject *Py_rpnconst_init(void)
 	mod = PyModule_Create(&rpnconstmodule);
 	if(mod == NULL) { return NULL; }
 
+	rpn_mutation_init_params(&rpn_mutation_params_default);
+
 	if(Py_rpnconst_add(mod, "POS_LINEAR", RPN_IF_POSITION_LINEAR) ||
 		Py_rpnconst_add(mod, "POS_XY", RPN_IF_POSITION_XY) ||
 		Py_rpnconst_add(mod, "POS_XDIM", RPN_IF_POSITION_XDIM) ||

python_const.h

@@ -27,12 +27,25 @@
 #include <Python.h>
 #include "structmember.h"
 
+#include "rpn_mutate.h"
 #include "rpn_if_default.h"
 
 /**@brief pyrpn.const module specs
  * @ingroup python_module */
 extern PyModuleDef rpnconstmodule;
 
+/**@brief A single instance of this object is used for parameters representation */
+extern PyTypeObject rpnif_params_SeqDesc;
+extern PyStructSequence_Desc rpnif_params_desc;
+
+extern PyTypeObject rpn_token_types_SeqDesc;
+extern PyStructSequence_Desc rpn_token_types_desc;
+
+extern PyTypeObject rpn_mutation_params_SeqDesc;
+extern PyStructSequence_Desc rpn_mutation_params_desc;
+
+extern rpn_mutation_params_t rpn_mutation_params_default;
+
 /**@brief pyrpn.const module initialisation function
  * @ingroup python_module */
 PyObject *Py_rpnconst_init(void);

python_if.c

@@ -1,33 +1,5 @@
 #include "python_if.h"
 
-static PyStructSequence_Field params_fields[] = {
-	{	.name = "pos_flag",
-		.doc = "Position flag, indicating coordinate system",
-	},
-	{	.name =  "res_flag",
-		.doc = "Result flag, indicate how to handle expr results",
-	},
-	{	.name = "size_lim",
-		.doc = "Size limit, an array indicating the space size (depends \
-on pos_flag",
-	},
-	{
-		.name = "const_values",
-		.doc = "Constant values to use when setting value in space \
-(expr gives the position, and we set this value",
-	},
-	{ NULL, NULL },
-};
-PyStructSequence_Desc rpnif_params_desc = {
-	.name = "RPNIterParams",
-	.doc = "Named tuple for RPNIter parameters",
-	.n_in_sequence = (sizeof(params_fields) / sizeof(*params_fields))-1,
-	.fields = params_fields,
-};
-
-PyTypeObject rpnif_params_SeqDesc;
-
-
 PyMethodDef RPNIterExpr_methods[] = {
 	{"get_params", (PyCFunction)rpnif_get_params, METH_NOARGS,
 		"Get a named tuple with parameters"},

python_if.h

@@ -30,6 +30,7 @@
 #include "rpn_if.h"
 #include "rpn_if_default.h"
 #include "python_rpnexpr.h"
+#include "python_const.h"
 
 /**@defgroup python_if RPN Iterated Function Python class
  * @ingroup python_module
@@ -49,10 +50,6 @@
  * This file is the header of the RPNIterExpr Python class
  */
 
-/**@brief A single instance of this object is used for parameters representation */
-extern PyTypeObject rpnif_params_SeqDesc;
-extern PyStructSequence_Desc rpnif_params_desc;
-
 /**@brief RPNIterExpr Python class methods list
  * @ingroup python_if */
 extern PyMethodDef RPNIterExpr_methods[];

python_pyrpn.c

@@ -58,46 +58,37 @@ PyInit_pyrpn(void)
 	const_mod = Py_rpnconst_init();
 	if(const_mod == NULL)
 	{
-		Py_DECREF(mod);
-		return NULL;
+		goto fail_init;
 	}
 	Py_INCREF(const_mod);
 	if(PyModule_AddObject(mod, "const", const_mod) < 0)
 	{
-		Py_DECREF(const_mod);
-		Py_DECREF(mod);
-		return NULL;
+		goto fail_add_const;
 	}
 
 	// Init RPNExpr type
 	if(PyType_Ready(&RPNExprType) < 0)
 	{
-		return NULL;
+		goto fail_expr_type_ready;
 	}
 
 	// Add type to module
 	Py_INCREF(&RPNExprType);
 	if(PyModule_AddObject(mod, "RPNExpr", (PyObject*)&RPNExprType) < 0)
 	{
-		Py_DECREF(&RPNExprType);
-		Py_DECREF(mod);
-		Py_DECREF(const_mod);
-		return NULL;
+		goto fail_add_rpnexpr;
 	}
 
 	// Init RPNIterExpr type
 	if(PyType_Ready(&RPNIterExprType) < 0)
 	{
-		return NULL;
+		goto fail_iter_type_ready;
 	}
 
 	Py_INCREF(&RPNIterExprType);
 	if(PyModule_AddObject(mod, "RPNIterExpr", (PyObject*)&RPNIterExprType) < 0)
 	{
-		Py_DECREF(&RPNExprType);
-		Py_DECREF(&RPNIterExprType);
-		Py_DECREF(mod);
-		return NULL;
+		goto fail_add_iter;
 	}
 
 	// Named tuple for RPNIterExpr's params
@@ -110,15 +101,47 @@ PyInit_pyrpn(void)
 	if(PyModule_AddObject(mod, "RPNIterExprParams",
 		(PyObject*)&rpnif_params_SeqDesc) < 0)
 	{
-		Py_DECREF(&RPNExprType);
-		Py_DECREF(&RPNIterExprType);
-		Py_DECREF(&rpnif_params_SeqDesc);
-		Py_DECREF(mod);
-		return NULL;
+		goto fail_add_iter_expr_params;
 	}
 
+	// Named tuple for token types
+	PyStructSequence_InitType(&rpn_token_types_SeqDesc,
+			&rpn_token_types_desc);
+	Py_INCREF(&rpn_token_types_SeqDesc);
+	if(PyModule_AddObject(mod, "RPNTokenTypesTuple",
+				(PyObject*)&rpn_token_types_SeqDesc) < 0)
+	{
+		goto fail_add_token_types_tuple;
+	}
+
+	// Named tuple for mutation parameters
+	PyStructSequence_InitType(&rpn_mutation_params_SeqDesc,
+			&rpn_mutation_params_desc);
+	Py_INCREF(&rpn_mutation_params_SeqDesc);
+	if(PyModule_AddObject(mod, "RPNMutationParamsTuple",
+				(PyObject*)&rpn_mutation_params_SeqDesc) < 0)
+	{
+		goto fail_add_mutation_params_tuple;
+	}
 
 	return mod;
+
+fail_add_mutation_params_tuple:
+	Py_DECREF(&rpn_token_types_SeqDesc);
+fail_add_token_types_tuple:
+	Py_DECREF(&rpnif_params_SeqDesc);
+fail_add_iter_expr_params:
+fail_add_iter:
+	Py_DECREF(&RPNIterExprType);
+fail_iter_type_ready:
+fail_add_rpnexpr:
+	Py_DECREF(&RPNExprType);
+fail_expr_type_ready:
+fail_add_const:
+	Py_DECREF(const_mod);
+fail_init:
+	Py_DECREF(mod);
+	return NULL;
 }
 
 PyObject* pyrpn_ops(PyObject* mod, PyObject* noargs)