Changeset 7120:4a840961f7af

Timestamp:

10/21/07 18:17:26 (6 years ago)

Author:

Robert L Miller <rlm@…>

Branch:

default

Message:

graph_isom memory management cleanup

File:

• sage/graphs/graph_isom.pyx (modified) (5 diffs)

sage/graphs/graph_isom.pyx

@@ -1206 +1206 @@
     cdef int *gamma # for storing permutations
     cdef int *alpha # for storing pointers to cells of nu[k]:
-                     # allocated to be length 4*n for scratch (see functions
+                     # allocated to be length 4*n + 1 for scratch (see functions
                      # _sort_by_function and _refine_by_square_matrix)
     cdef int *v # list of vertices determining nu
@@ -1248 +1248 @@
     Pi = Pi2
 
-    # allocate pointers
-    W = <int **> sage_malloc( 2 * (n + L) * sizeof(int *) )
-    if not W:
-        raise MemoryError("Error allocating memory. Perhaps you are out?")
-    M = W + n
-    Phi = W + 2*n
-    Omega = W + 2*n + L
-    
-    # allocate pointers for GMP ints
-    Lambda_mpz = <mpz_t *> sage_malloc( 3 * (n+2) * sizeof(mpz_t) )
-    if not Lambda_mpz:
+    # allocate int pointers
+    W = <int **> sage_malloc( n * sizeof(int *) )
+    M = <int **> sage_malloc( n * sizeof(int *) )
+    Phi = <int **> sage_malloc( L * sizeof(int *) )
+    Omega = <int **> sage_malloc( L * sizeof(int *) )
+    
+    # allocate GMP int pointers
+    Lambda_mpz = <mpz_t *> sage_malloc( (n+2) * sizeof(mpz_t) )
+    zf_mpz = <mpz_t *> sage_malloc( (n+2) * sizeof(mpz_t) )
+    zb_mpz = <mpz_t *> sage_malloc( (n+2) * sizeof(mpz_t) )
+    
+    # check for memory errors
+    if not (W and M and Phi and Omega and Lambda_mpz and zf_mpz and zb_mpz):
+        sage_free(Lambda_mpz)
+        sage_free(zf_mpz)
+        sage_free(zb_mpz)
         sage_free(W)
-        raise MemoryError("Error allocating memory. Perhaps you are out?")
-    zf_mpz = Lambda_mpz + n + 2
-    zb_mpz = Lambda_mpz + 2*n + 4
-    
-    # allocate arrays
-    gamma = <int *> sage_malloc( ( n * ( 2 * (n + L) + 7 ) + 1 ) * sizeof(int) )
-    if not gamma:
+        sage_free(M)
+        sage_free(Phi)
+        sage_free(Omega)
+        raise MemoryError("Error allocating memory.")
+    
+    # allocate int arrays
+    gamma = <int *> sage_malloc( n * sizeof(int) )
+    W[0] = <int *> sage_malloc( (n*n) * sizeof(int) )
+    M[0] = <int *> sage_malloc( (n*n) * sizeof(int) )
+    Phi[0] = <int *> sage_malloc( (L*n) * sizeof(int) )
+    Omega[0] = <int *> sage_malloc( (L*n) * sizeof(int) )
+    alpha = <int *> sage_malloc( (4*n + 1) * sizeof(int) )
+    v = <int *> sage_malloc( n * sizeof(int) )
+    e = <int *> sage_malloc( n * sizeof(int) )
+
+    # check for memory errors
+    if not (gamma and W[0] and M[0] and Phi[0] and Omega[0] and alpha and v and e):
+        sage_free(gamma)
+        sage_free(W[0])
+        sage_free(M[0])
+        sage_free(Phi[0])
+        sage_free(Omega[0])
+        sage_free(alpha)
+        sage_free(v)
+        sage_free(e)
+        sage_free(Lambda_mpz)
+        sage_free(zf_mpz)
+        sage_free(zb_mpz)
         sage_free(W)
-        sage_free(Lambda_mpz)
-        raise MemoryError("Error allocating memory. Perhaps you are out?")
-    alpha = gamma + n*( 2*(n + L) + 1 )
-    v = alpha + 4*n + 1
-    e = v + n
-    for i from 0 <= i < n:
-        W[i] = gamma + n + n*i
-        M[i] = gamma + n*( 1 + n + 2*L + i )
+        sage_free(M)
+        sage_free(Phi)
+        sage_free(Omega)
+        raise MemoryError("Error allocating memory.")
+
+    # setup double index arrays
+    for i from 0 < i < n:
+        W[i] = W[0] + n*i
+    for i from 0 < i < n:
+        M[i] = M[0] + n*i
+    for i from 0 < i < L:
+        Phi[i] = Phi[0] + n*i
+    for i from 0 < i < L:
+        Omega[i] = Omega[0] + n*i
     
     # allocate GMP ints
@@ -1284 +1316 @@
         # Note that there is a potential memory leak here - if a particular
         # mpz fails to allocate, this is not checked for
-    for i from 0 <= i < L:
-        Phi[i] = gamma + n*( 1 + n + i )
-        Omega[i] = gamma + n*( 1 + n + i + L )
-    
-    # create the dense boolean matrix
+    
+    # initialize M and W
     for i from 0 <= i < n:
         for j from 0 <= j < n:
@@ -1749 +1778 @@
             state = 13
             
-    # deallocate the MP integers
+    # free the GMP ints
     for i from 0 <= i < n:
         mpz_clear(Lambda_mpz[i])
@@ -1755 +1784 @@
         mpz_clear(zb_mpz[i])
 
+    # free int arrays
+    sage_free(gamma)
+    sage_free(W[0])
+    sage_free(M[0])
+    sage_free(Phi[0])
+    sage_free(Omega[0])
+    sage_free(alpha)
+    sage_free(v)
+    sage_free(e)
+    
+    # free GMP int pointers
+    sage_free(Lambda_mpz)
+    sage_free(zf_mpz)
+    sage_free(zb_mpz)
+    
+    # free int pointers
     sage_free(W)
-    sage_free(Lambda_mpz)
-    sage_free(gamma)
+    sage_free(M)
+    sage_free(Phi)
+    sage_free(Omega)
     
     # use to and from mappings to relabel vertices back from the set {0,...,n-1}