refactored to remove some redundant init functions

Author: dance858

include/affine.h

@@ -5,10 +5,6 @@
 #include "subexpr.h"
 #include "utils/CSR_Matrix.h"
 
-/* Helper function to initialize a linear operator expr (can be used with derived
- * types) */
-void init_linear_op(expr *node, expr *child, int d1, int d2);
-
 expr *new_linear(expr *u, const CSR_Matrix *A);
 
 expr *new_add(expr *left, expr *right);

include/expr.h

@@ -54,7 +54,9 @@ typedef struct expr
 
 } expr;
 
-void init_expr(expr *node, int d1, int d2, int n_vars);
+void init_expr(expr *node, int d1, int d2, int n_vars, forward_fn forward,
+               jacobian_init_fn jacobian_init, eval_jacobian_fn eval_jacobian,
+               is_affine_fn is_affine, free_type_data_fn free_type_data);
 
 expr *new_expr(int d1, int d2, int n_vars);
 void free_expr(expr *node);

include/other.h

@@ -5,9 +5,6 @@
 #include "subexpr.h"
 #include "utils/CSR_Matrix.h"
 
-/* Helper function to initialize a quad_form expr (can be used with derived types) */
-void init_quad_form(expr *node, expr *child);
-
 expr *new_quad_form(expr *child, CSR_Matrix *Q);
 
 #endif /* OTHER_H */

src/affine/hstack.c

@@ -115,16 +115,8 @@ expr *new_hstack(expr **args, int n_args, int n_vars)
     /* Allocate the type-specific struct */
     hstack_expr *hnode = (hstack_expr *) calloc(1, sizeof(hstack_expr));
     expr *node = &hnode->base;
-
-    /* Initialize basic fields */
-    init_expr(node, args[0]->d1, d2, n_vars);
-
-    /* Set function pointers */
-    node->forward = forward;
-    node->jacobian_init = jacobian_init;
-    node->eval_jacobian = eval_jacobian;
-    node->is_affine = is_affine;
-    node->free_type_data = free_type_data;
+    init_expr(node, args[0]->d1, d2, n_vars, forward, jacobian_init, eval_jacobian,
+              is_affine, free_type_data);
 
     /* Set type-specific fields */
     hnode->args = args;

src/affine/linear_op.c

@@ -23,45 +23,21 @@ static void free_type_data(expr *node)
     free_csc_matrix(lin_node->A_csc);
 }
 
-/* Helper function to initialize a linear operator expr */
-void init_linear_op(expr *node, expr *child, int d1, int d2)
-{
-    node->d1 = d1;
-    node->d2 = d2;
-    node->size = d1 * d2;
-    node->n_vars = child->n_vars;
-    node->var_id = -1;
-    node->refcount = 1;
-    node->left = child;
-    node->right = NULL;
-    node->dwork = NULL;
-    node->iwork = NULL;
-    node->value = (double *) calloc(node->size, sizeof(double));
-    node->jacobian = NULL;
-    node->wsum_hess = NULL;
-    node->jacobian_init = NULL;
-    node->wsum_hess_init = NULL;
-    node->eval_jacobian = NULL;
-    node->eval_wsum_hess = NULL;
-    node->local_jacobian = NULL;
-    node->local_wsum_hess = NULL;
-    node->forward = forward;
-    node->is_affine = is_affine;
-    node->free_type_data = free_type_data;
-
-    expr_retain(child);
-}
-
 expr *new_linear(expr *u, const CSR_Matrix *A)
 {
     /* Allocate the type-specific struct */
-    linear_op_expr *lin_node = (linear_op_expr *) malloc(sizeof(linear_op_expr));
+    linear_op_expr *lin_node = (linear_op_expr *) calloc(1, sizeof(linear_op_expr));
     if (!lin_node) return NULL;
 
     expr *node = &lin_node->base;
 
-    /* Initialize base linear operator fields */
-    init_linear_op(node, u, A->m, 1);
+    /* Initialize base fields */
+    init_expr(node, A->m, 1, u->n_vars, forward, NULL, NULL, is_affine,
+              free_type_data);
+
+    /* Set left child */
+    node->left = u;
+    expr_retain(u);
 
     /* Check if allocation succeeded */
     if (!node->value)

src/elementwise_univariate/common.c

@@ -103,39 +103,23 @@ bool is_affine_elementwise(const expr *node)
  */
 void init_elementwise(expr *node, expr *child)
 {
-    /* Initialize dimensions from child */
-    node->d1 = child->d1;
-    node->d2 = child->d2;
-    node->size = child->d1 * child->d2;
-    node->n_vars = child->n_vars;
-    node->var_id = -1;
-    node->refcount = 1;
+    /* Initialize base fields */
+    init_expr(node, child->d1, child->d2, child->n_vars, NULL,
+              jacobian_init_elementwise, eval_jacobian_elementwise,
+              is_affine_elementwise, NULL);
 
-    /* Allocate the value array */
-    node->value = (double *) calloc(node->size, sizeof(double));
-
-    node->left = child;
-    node->right = NULL;
-    node->dwork = NULL;
-    node->iwork = NULL;
-    node->jacobian = NULL;
-    node->wsum_hess = NULL;
-    node->jacobian_init = jacobian_init_elementwise;
+    /* Set wsum_hess functions */
     node->wsum_hess_init = wsum_hess_init_elementwise;
-    node->eval_jacobian = eval_jacobian_elementwise;
     node->eval_wsum_hess = eval_wsum_hess_elementwise;
-    node->local_jacobian = NULL;
-    node->local_wsum_hess = NULL;
-    node->is_affine = is_affine_elementwise;
-    node->forward = NULL;
-    node->free_type_data = NULL;
 
+    /* Set left child */
+    node->left = child;
     expr_retain(child);
 }
 
 expr *new_elementwise(expr *child)
 {
-    expr *node = (expr *) malloc(sizeof(expr));
+    expr *node = (expr *) calloc(1, sizeof(expr));
     if (!node) return NULL;
 
     init_elementwise(node, child);

src/elementwise_univariate/power.c

@@ -43,7 +43,7 @@ static void local_wsum_hess(expr *node, double *out, const double *w)
 expr *new_power(expr *child, int p)
 {
     /* Allocate the type-specific struct */
-    power_expr *pnode = (power_expr *) malloc(sizeof(power_expr));
+    power_expr *pnode = (power_expr *) calloc(1, sizeof(power_expr));
     expr *node = &pnode->base;
 
     /* Initialize base elementwise fields */

src/expr.c

@@ -3,7 +3,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-void init_expr(expr *node, int d1, int d2, int n_vars)
+void init_expr(expr *node, int d1, int d2, int n_vars, forward_fn forward,
+               jacobian_init_fn jacobian_init, eval_jacobian_fn eval_jacobian,
+               is_affine_fn is_affine, free_type_data_fn free_type_data)
 {
     node->d1 = d1;
     node->d2 = d2;
@@ -12,12 +14,17 @@ void init_expr(expr *node, int d1, int d2, int n_vars)
     node->refcount = 1;
     node->value = (double *) calloc(d1 * d2, sizeof(double));
     node->var_id = -1;
+    node->forward = forward;
+    node->jacobian_init = jacobian_init;
+    node->eval_jacobian = eval_jacobian;
+    node->is_affine = is_affine;
+    node->free_type_data = free_type_data;
 }
 
 expr *new_expr(int d1, int d2, int n_vars)
 {
     expr *node = (expr *) calloc(1, sizeof(expr));
-    init_expr(node, d1, d2, n_vars);
+    init_expr(node, d1, d2, n_vars, NULL, NULL, NULL, NULL, NULL);
     return node;
 }
 

src/other/quad_form.c

@@ -103,40 +103,18 @@ static void eval_jacobian(expr *node)
     }
 }
 
-/* Helper function to initialize a quad_form expr */
-void init_quad_form(expr *node, expr *child)
-{
-    node->d1 = child->d1;
-    node->d2 = 1;
-    node->size = child->d1 * 1;
-    node->n_vars = child->n_vars;
-    node->var_id = -1;
-    node->refcount = 1;
-    node->left = child;
-    node->right = NULL;
-    node->dwork = NULL;
-    node->iwork = NULL;
-    node->value = (double *) calloc(node->size, sizeof(double));
-    node->jacobian = NULL;
-    node->wsum_hess = NULL;
-    node->jacobian_init = jacobian_init;
-    node->wsum_hess_init = NULL;
-    node->eval_jacobian = eval_jacobian;
-    node->eval_wsum_hess = NULL;
-    node->local_jacobian = NULL;
-    node->local_wsum_hess = NULL;
-    node->is_affine = NULL;
-    node->forward = forward;
-    node->free_type_data = NULL;
-
-    expr_retain(child);
-}
-
 expr *new_quad_form(expr *left, CSR_Matrix *Q)
 {
-    quad_form_expr *qnode = (quad_form_expr *) malloc(sizeof(quad_form_expr));
+    quad_form_expr *qnode = (quad_form_expr *) calloc(1, sizeof(quad_form_expr));
     expr *node = &qnode->base;
-    init_quad_form(node, left);
+
+    /* Initialize base fields */
+    init_expr(node, left->d1, 1, left->n_vars, forward, jacobian_init, eval_jacobian,
+              NULL, NULL);
+
+    /* Set left child */
+    node->left = left;
+    expr_retain(left);
 
     /* Set type-specific field */
     qnode->Q = Q;