Projects >> AFS-Dev >>576ea5fffc261c83c3b3f16073234f9c5a32ccc9

Chunk
Conflicting content 
            
            byte[] keyStart1 = { 0 , 2 } ;
            byte[] keyStart2 = { 0 , 1 } ;
<<<<<<< HEAD
            byte[] keyStart3 = { 0 , 2 , 4 } ;
            byte[] keyStart4 = { 0 , 2 , 4 , 6 } ;
            byte[] keyStart5 = { 0 , 2 , 4 , 5 , 1 } ;
            byte[] keyFinish = null ;
            RadixTree t = tree(k1,k2,k3,k4,k5) ;
            //t.printLeaves() ;
=======
            byte[] keyStart3 = { 0 , 2 , 4} ;
            byte[] keyStart4 = { 0 , 2 , 4, 6} ;
            byte[] keyStart5 = { 99 } ;
            
            byte[] keyFinish = null ;
            //RadixTree t = tree(k1,k2,k3,k6) ;
            RadixTree t = tree(k1,k6) ;
>>>>>>> 176fa0a68e643a70940e49531faca2167b16f770
            t.print() ;
            t.printLeaves() ;
Solution content 
            
            byte[] keyStart1 = { 0 , 2 } ;
            byte[] keyStart2 = { 0 , 1 } ;
            byte[] keyStart3 = { 0 , 2 , 4} ;
            byte[] keyStart4 = { 0 , 2 , 4, 5 } ;
            byte[] keyStart5 = { 0 , 2 , 4, 6 } ;
            byte[] keyStart6 = { 0 , 2 , 4, 7 } ;
            
            byte[] keyStart9 = { 99 } ;
            
            byte[] keyFinish = null ;
            //RadixTree t = tree(k1,k2,k3,k6) ;
            RadixTree t = tree(k1,k6) ;
            t.print() ;
            t.printLeaves() ;
File
MainRadix.java
Developer's decision
Manual
Kind of conflict
Array initializer
Comment
Method invocation
Variable
Chunk
Conflicting content 
            iterator(t, keyStart3, keyFinish) ;
            iterator(t, keyStart4, keyFinish) ;
            iterator(t, keyStart5, keyFinish) ;
<<<<<<< HEAD
            
=======
        }
        
        
        if ( true )
        {    
            byte[] keyStart = { 2, 4, 6, 1} ;
            byte[] keyFinish = null ;
            RadixTree t = tree(key1, key2, key3, key4, key5, key6) ;
            t.printLeaves() ;
            System.out.println("** Iterator("+Str.str(keyStart)+", "+Str.str(keyFinish)+")") ;
            testIter(t, keyStart, keyFinish, key1, key4, key2) ;
>>>>>>> 176fa0a68e643a70940e49531faca2167b16f770
            //testIter(t, keyStart, keyFinish, k2, k3) ; 
            RadixTree.logging = false ;
        }
Solution content 
            iterator(t, keyStart3, keyFinish) ;
            iterator(t, keyStart4, keyFinish) ;
            iterator(t, keyStart5, keyFinish) ;
            iterator(t, keyStart6, keyFinish) ;
            iterator(t, keyStart9, keyFinish) ;
        }
        
        
        if ( true )
        {    
            byte[] keyStart = key1 ;
            byte[] keyFinish = { 2 , 4 , 6 , 9 } ;
            RadixTree t = tree(key1, key2, key3, key4, key5, key6) ;
            t.print() ;
            t.printLeaves() ;
            RadixTree.logging = true ;
            System.out.println("** Iterator("+Str.str(keyStart)+", "+Str.str(keyFinish)+")") ;
            
            iterator(t, keyStart, keyFinish) ;
            testIter(t, keyStart, keyFinish, key1, key4) ;
        }
File
MainRadix.java
Developer's decision
Manual
Kind of conflict
Array initializer
If statement
Method invocation
Variable