Changeset 31142 in project


Ignore:
Timestamp:
07/23/14 02:45:30 (6 years ago)
Author:
Ivan Raikov
Message:

picnic: fixes to segment computation part of swc support

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/4/picnic/trunk/picnic-utils.scm

    r31141 r31142  
    896896            )
    897897
    898         (define (tree-graph-distances+segments g)
     898        (define (tree-graph-distances+segments g nseg)
    899899
    900900          (define n        ((g 'capacity)))
    901901          (define distv    (make-f64vector (+ 1 n) -1.0))
     902          (define segv     (make-s32vector (+ 1 n) -1))
    902903         
    903904          (define (traverse es)
     
    915916          (let ((root 1))
    916917            (f64vector-set! distv root 0.0)
     918            (s32vector-set! segv root 0)
    917919            (traverse ((g 'out-edges) root))
    918             distv)
    919           )
     920            (list distv segv)
     921          ))
     922
    920923
    921924        (define (tree-graph->genpoints g gdistv gsegv type cell-index)
     
    954957
    955958 
    956         (define (load-swc filename type label index)
     959        (define (load-swc filename label type nseg index)
    957960         
    958961          (let ((in (open-input-file filename)))
     
    978981                   (swc-graph (make-tree-graph swc-data label))
    979982
    980                    (dist+segs  (tree-graph-distances+segments swc-graph))
     983                   (dist+segs  (tree-graph-distances+segments swc-graph nseg))
    981984                   (point-data (tree-graph->genpoints
    982985                                swc-graph (car dist+segs) (cadr dist+segs)
Note: See TracChangeset for help on using the changeset viewer.