*** graphobject.c 2010-08-04 14:19:46.000000000 -0400 --- ../../original/python-igraph-0.5.3/src/graphobject.c 2010-01-07 07:09:37.000000000 -0500 *************** *** 5010,5042 **** PyObject *args, PyObject *kwds) { static char *kwlist[] = { "niter", "node_charge", "node_mass", "spring_length", "spring_constant", ! "max_sa_movement", "seed", NULL }; igraph_matrix_t m; long niter = 500; double node_charge = 0.001, node_mass = 30; long spring_length = 0; double spring_constant = 1, max_sa_movement = 5; ! PyObject *result, *seed_o = Py_None; ! igraph_bool_t use_seed=0; ! if (!PyArg_ParseTupleAndKeywords(args, kwds, "|lddlddO", kwlist, &niter, &node_charge, &node_mass, &spring_length, &spring_constant, ! &max_sa_movement, &seed_o)) return NULL; ! if (seed_o == 0 || seed_o == Py_None) { ! if (igraph_matrix_init(&m, 1, 1)) { ! igraphmodule_handle_igraph_error(); ! return NULL; ! } ! } else { ! use_seed=1; ! if (igraphmodule_PyList_to_matrix_t(seed_o, &m)) return NULL; } if (igraph_layout_graphopt(&self->g, &m, niter, node_charge, node_mass, ! spring_length, spring_constant, max_sa_movement, use_seed)) { igraph_matrix_destroy(&m); igraphmodule_handle_igraph_error(); return NULL; --- 5010,5036 ---- PyObject *args, PyObject *kwds) { static char *kwlist[] = { "niter", "node_charge", "node_mass", "spring_length", "spring_constant", ! "max_sa_movement", NULL }; igraph_matrix_t m; long niter = 500; double node_charge = 0.001, node_mass = 30; long spring_length = 0; double spring_constant = 1, max_sa_movement = 5; ! PyObject *result; ! if (!PyArg_ParseTupleAndKeywords(args, kwds, "|lddldd", kwlist, &niter, &node_charge, &node_mass, &spring_length, &spring_constant, ! &max_sa_movement)) return NULL; ! if (igraph_matrix_init(&m, 1, 1)) { ! igraphmodule_handle_igraph_error(); ! return NULL; } if (igraph_layout_graphopt(&self->g, &m, niter, node_charge, node_mass, ! spring_length, spring_constant, max_sa_movement, 0)) { igraph_matrix_destroy(&m); igraphmodule_handle_igraph_error(); return NULL;