Changeset 24817 in project for release/4/interval-digraph/trunk


Ignore:
Timestamp:
08/26/11 10:31:27 (10 years ago)
Author:
Ivan Raikov
Message:

interval-digraph: bug fixes in the connection generator interface

Location:
release/4/interval-digraph/trunk/connection_generator
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/interval-digraph/trunk/connection_generator/interval_digraph_test.scm

    r24815 r24817  
    2525                      g sources)
    2626                     ))
     27     
    2728      g)))
    2829
  • release/4/interval-digraph/trunk/connection_generator/interval_graph_connection_generator.cpp

    r24816 r24817  
    426426         
    427427          void *is = make_cis (inter.first, inter.last);
    428          
    429           printf ("setMask: isempty (source_iset) = %d\n",
    430                   c_cis_isempty (source_iset));
    431 
    432           printf ("setMask: before source_iset\n");
    433428          source_iset = c_cis_union (is, source_iset);
    434           printf ("setMask: after source_iset\n");
    435429         
    436430          release_gc_root (is);
     
    526520          {
    527521               if (pmap != NULL) release_gc_root (pmap);
    528                source_iset_index = c_cis_getmin (remaining_source_iset);
    529                remaining_source_iset = c_cis_remove (source_iset_index, remaining_source_iset);
    530 
    531                printf ("source_iset_index = %d\n",
    532                        source_iset_index);
    533 
    534                succ_iset = c_idg_succ_interval (source_iset_index, igraph);
    535                
    536          
    537                printf ("next: isempty (target_iset) = %d\n",
    538                        c_cis_isempty (target_iset));
    539 
    540                printf ("next: isempty (succ_iset) = %d\n",
    541                        c_cis_isempty (succ_iset));
     522               do
     523               {
     524                    source_iset_index = c_cis_getmin (remaining_source_iset);
     525                    remaining_source_iset = c_cis_remove (source_iset_index, remaining_source_iset);
     526                   
     527                    succ_iset = c_idg_succ_interval (source_iset_index, igraph);
     528
     529               } while ((c_cis_isempty (succ_iset)) && (!(c_cis_isempty (remaining_source_iset))));
     530
     531
     532               if (c_cis_isempty (remaining_source_iset)) return false;
    542533
    543534               cset = c_cis_intersection (succ_iset, target_iset);
    544 
    545                printf ("next: isempty (cset) = %d\n",
    546                        c_cis_isempty (cset));
    547 
    548               if (c_cis_isempty (cset)) return false;
    549535
    550536               release_gc_root (succ_iset);
Note: See TracChangeset for help on using the changeset viewer.