Changeset b30c30d

Timestamp:

11/19/13 13:31:38 (11 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

d6a59ca

Parents:

b97a556

git-author:

Tomasz Obrebski <obrebski@…> (11/19/13 13:31:38)

git-committer:

Tomasz Obrebski <obrebski@…> (11/19/13 13:31:38)

Message:

tre czyta poprawnie wyj�cie z dgp

File:

• src/tre/tre (modified) (2 diffs)

src/tre/tre

@@ -278 +278 @@
     $sat << i if parts[1]=="s"
 
-    $arcs |= parts[2].split(',').map{ |a| case a 
-                                          when /\-\-(\w+)-(\d+)\((\d+)~(\d+)\)/
+    $arcs |= parts[2].scan(/\([^()]+\)/).map{ |a| case a 
+                                          when /\-\-(\w+):(\d+)/
                                             # [i, $2.to_i, $1, $3.to_i, $4.to_i]
                                             [i, $2.to_i, $1, 0, 0]
-                                          when /\+\+(\w+)-(\d+)\((\d+)~(\d+)\)/
+                                          when /\+\+(\w+):(\d+)/
                                             # [$2.to_i, i, $1, $3.to_i, $4.to_i]
                                             [$2.to_i, i, $1, 0, 0]
@@ -380 +380 @@
   if $DEBUG then print "buildR--#{min}--#{max}--#{tree.inspect}\n" end
   trees=[]
+  print $arcs
   for arc in $arcs.select{|a| a[0]==max && $vis.include?([min,a[1]]) }
     if $DEBUG then print "ARC: #{arc.inspect}\n" end