trace_visualization 0.0.2 → 0.0.3

data/lib/trace_visualization/utils.rb

@@ -10,7 +10,7 @@ module TraceVisualization
     
     # Get the start position of lines
     def self.lines_pos(str)
-      TraceVisualization.assert_instance_of(str, String)
+      TraceVisualization.assert_instance_of(str, Mapping)
       
       lines_pos = [0]
       pos = -1

data/lib/trace_visualization/version.rb

@@ -1,3 +1,3 @@
 module TraceVisualization
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/trace_visualization/visualization/console_color_print.rb

@@ -6,28 +6,28 @@ module TraceVisualization
       
       GRN  = "\033[1;32m"
       YLW  = "\033[1;33m"
-      FNSH = "\033[0m"
+      FINISH = "\033[0m"
       
-      def self.hl(str, repetition)
-        raise "repetition must be instance of TraceVisualization::Data::Repetition" if not repetition.instance_of? TraceVisualization::Data::Repetition
+      def self.hl(mapping, repetition)
+        raise 'repetition must be instance of TraceVisualization::Data::Repetition' if not repetition.instance_of? TraceVisualization::Data::Repetition
         
-        result = ""
+        result = ''
         prev_position = 0
         positions = repetition.build_positions
     
         positions.each do |position|
-          result += str[prev_position ... position[0][0]]
+          result += mapping.restore(prev_position, position[0][0])
       
           for i in 0 ... position.size
             pos, len = position[i]
-            result += GRN + "#{str[pos ... pos + len]}" + FNSH
-            result += YLW + "#{str[pos + len ... position[i + 1][0]]}" + FNSH if i < position.size - 1
+            result += GRN + "#{mapping.restore(pos, pos + len)}" + FINISH
+            result += YLW + "#{mapping.restore(pos + len, position[i + 1][0])}" + FINISH if i < position.size - 1
           end
       
           prev_position = position[-1][0] + position[-1][1]
         end
     
-        result += str[prev_position .. -1]
+        result += mapping.restore(prev_position, -1)
       end
     end
   end

data/spec/bwt_spec.rb

@@ -48,9 +48,7 @@ describe TraceVisualization::BurrowsWheelerTransform do
     ws.to_str.should eq " "
     a.to_str.should eq "a"
     b.to_str.should eq "b" 
-    
-    puts "ip.ord = #{ip.ord}, ws.ord = #{ws.ord}, a = #{a.ord}, b = #{b.ord}"
-    
+
     sa = TraceVisualization::SuffixArray.effective(mapped_str)
     
     (sa.length == mapped_str.length).should be_true
@@ -60,9 +58,9 @@ describe TraceVisualization::BurrowsWheelerTransform do
 
     if ip < ws
       bwt.should     eq [ip, ip, a, ws, ws, b, ws]
-      bwt_str.should eq "127.0.0.1127.0.0.1a  b "
+      bwt_str.should eq '127.0.0.1127.0.0.1a  b '
     else
-      sadasfa 
+      # TODO Implement!
     end
   end
   

data/spec/longest_common_prefix_spec.rb

@@ -6,7 +6,7 @@ describe TraceVisualization::LongestCommonPrefix do
   
   context '.effective' do
     it 'should return array with longest common prefix in linear time' do
-  		str = "mississippi"
+  		str = 'mississippi'
       
       sa = TraceVisualization::SuffixArray.effective(str)
       lcp = TraceVisualization::LongestCommonPrefix.effective(str, sa, str.size)
@@ -16,10 +16,17 @@ describe TraceVisualization::LongestCommonPrefix do
     
     it 'should return correct result for mapped string', :current => true do
       str = "127.0.0.1 foo\r\n127.0.0.1 bar"
-      mapped_str = TraceVisualization::Mapping.new(str)
+
+      mapping = TraceVisualization::Mapping.init do
+        default_tokens
+      end
+
+      mapping.process do
+        from_string(str)
+      end
       
-      sa = TraceVisualization::SuffixArray.effective(mapped_str)
-      lcp = TraceVisualization::LongestCommonPrefix.effective(mapped_str, sa, mapped_str.length)
+      sa = TraceVisualization::SuffixArray.effective(mapping)
+      lcp = TraceVisualization::LongestCommonPrefix.effective(mapping, sa, mapping.length)
 
       sa.should eq([6, 5, 8, 1, 10, 9, 2, 4, 3, 11, 7, 0])
       lcp.should eq([0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 2])

data/spec/repetitions_concatenation_spec.rb

@@ -5,8 +5,14 @@ require 'trace_visualization/data/repetition'
 describe TraceVisualization::RepetitionsConcatenation do
   it "process common positions" do
     str = "aaaxbbbyaaazbbbvaaawbbb"
-    
-    context = TraceVisualization::Repetitions::Context.new(str, [])
+
+    mapping = TraceVisualization::Mapping.init do
+      default_tokens
+    end
+
+    mapping.process { from_string(str) }
+
+    context = TraceVisualization::Repetitions::Context.new(mapping, [])
     
     lpos = [0, 8, 16]
     rpos = [4, 12, 20]

data/spec/repetitions_psy_spec.rb

@@ -1,13 +1,12 @@
 require 'trace_visualization'
-require 'trace_visualization/repetitions_psy'
 require 'trace_visualization/suffix_array'
 require 'trace_visualization/longest_common_prefix'
 require 'trace_visualization/bwt'
-require 'trace_visualization/mapping'
+
 
 describe TraceVisualization::Repetitions do
   it 'simple test PSY1' do
-    TraceVisualization::Repetitions.psy1("aaabbbcccaaacccbbb", 3, false).should eq [
+    TraceVisualization::Repetitions.psy1('aaabbbcccaaacccbbb', 3, false).should eq [
         {:lcp=>3, :i=>0, :j=>1}, 
         {:lcp=>3, :i=>8, :j=>9}, 
         {:lcp=>3, :i=>16, :j=>17}
@@ -15,17 +14,31 @@ describe TraceVisualization::Repetitions do
   end
   
   it 'simple test PSY1 with mapping' do
-    str = "aaa[123]aaa"
-    mapped_str = TraceVisualization::Mapping.new(str)
+    str = 'aaa[123]aaa'
+
+    mapping = TraceVisualization::Mapping.init do
+      default_tokens
+    end
+
+    mapping.process do
+      from_string(str)
+    end
     
-    TraceVisualization::Repetitions.psy1(mapped_str, 3, false).should eq [{:lcp=>3, :i=>2, :j=>3}]
+    TraceVisualization::Repetitions.psy1(mapping, 3, false).should eq [{:lcp=>3, :i=>2, :j=>3}]
   end
   
   it 'test decode PSY1' do
     str = "aaa[123]xyz[654]aaa[123]" # <---> "aaaXxyzYaaaX"
-    mapped_str = TraceVisualization::Mapping.new(str)
+
+    mapping = TraceVisualization::Mapping.init do
+      default_tokens
+    end
+
+    mapping.process do
+      from_string(str)
+    end
     
-    rs = TraceVisualization::Repetitions.psy1(mapped_str, 3)
+    rs = TraceVisualization::Repetitions.psy1(mapping, 3)
     
     rs.size.should eq 1
     rs[0].length.should eq 4
@@ -33,7 +46,7 @@ describe TraceVisualization::Repetitions do
     
     length   = rs[0].length
     position = rs[0].left_positions[0]
-    
-    mapped_str.restore(position, length).should eq "aaa[123]"    
+
+    mapping.restore(position, length).should eq "aaa[123]"
   end
 end

data/spec/suffix_array_spec.rb

@@ -3,22 +3,29 @@ require 'trace_visualization/mapping'
 
 describe TraceVisualization::SuffixArray do
   
-  context ".naive" do
-    it "should return suffix array" do
-      TraceVisualization::SuffixArray.naive("abaabaab").should eq([5, 2, 6, 3, 0, 7, 4, 1])
-      TraceVisualization::SuffixArray.naive("abracadabra").should eq([10, 7, 0, 3, 5, 8, 1, 4, 6, 9, 2])
+  context '.naive' do
+    it 'should return suffix array' do
+      TraceVisualization::SuffixArray.naive('abaabaab').should eq([5, 2, 6, 3, 0, 7, 4, 1])
+      TraceVisualization::SuffixArray.naive('abracadabra').should eq([10, 7, 0, 3, 5, 8, 1, 4, 6, 9, 2])
     end
     
-    it "should correct process mapped string" do
-      str = "abc[123]def[456]ghi"
-      mapped_str = TraceVisualization::Mapping.new(str)
+    it 'should correct process mapped string' do
+      str = 'abc[123]def[456]ghi'
+
+      mapping = TraceVisualization::Mapping.init do
+        default_tokens
+      end
+
+      mapping.process do
+        from_string(str)
+      end
       
-      TraceVisualization::SuffixArray.naive(mapped_str).should eq([0, 1, 2, 4, 5, 6, 8, 9, 10, 3, 7])
+      TraceVisualization::SuffixArray.naive(mapping).should eq([0, 1, 2, 4, 5, 6, 8, 9, 10, 3, 7])
     end
   end
   
-  context ".radix_pass" do
-    it "do stable radix sort" do
+  context '.radix_pass' do
+    it 'do stable radix sort' do
   		str = [3, 3, 2, 1, 5, 5, 4]
   		a = [0, 1, 2, 3, 4, 5, 6]
       n = a.length
@@ -30,8 +37,8 @@ describe TraceVisualization::SuffixArray do
     end
   end
   
-  context ".effective_linear" do
-    it "should return suffix array for linear time (native function)" do
+  context '.effective_linear' do
+    it 'should return suffix array for linear time (native function)' do
   		s = [3, 3, 2, 1, 5, 5, 4, 0, 0, 0]
   		n = s.length - 3 # exclude last 3 zeros
   		alphabet_size = 10
@@ -43,47 +50,67 @@ describe TraceVisualization::SuffixArray do
     end
   end
   
-  context ".effective" do 
-    it "should return suffix array for linear time (wrapper function)" do
-      TraceVisualization::SuffixArray.effective("abaabaab").should eq(TraceVisualization::SuffixArray.naive("abaabaab"))
-      TraceVisualization::SuffixArray.effective("abracadabra").should eq(TraceVisualization::SuffixArray.naive("abracadabra"))      
+  context '.effective' do
+    it 'should return suffix array for linear time (wrapper function)' do
+      TraceVisualization::SuffixArray.effective('abaabaab').should eq(TraceVisualization::SuffixArray.naive('abaabaab'))
+      TraceVisualization::SuffixArray.effective('abracadabra').should eq(TraceVisualization::SuffixArray.naive('abracadabra'))
     end
     
-    it "should correct process mapped string" do
-      str = "abc[123]def[456]ghi"
-      mapped_str = TraceVisualization::Mapping.new(str)
+    it 'should correct process mapped string' do
+      str = 'abc[123]def[456]ghi'
+
+      mapping = TraceVisualization::Mapping.init do
+        default_tokens
+      end
+
+      mapping.process do
+        from_string(str)
+      end
       
-      TraceVisualization::SuffixArray.effective(mapped_str).should eq([0, 1, 2, 4, 5, 6, 8, 9, 10, 3, 7])
+      TraceVisualization::SuffixArray.effective(mapping).should eq([0, 1, 2, 4, 5, 6, 8, 9, 10, 3, 7])
     end
     
-    it "another string for mapped processing" do
+    it 'another string for mapped processing' do
       str = "127.0.0.1 a 127.0.0.1 b"
       
       # 'X a X b'
-      mapped_str = TraceVisualization::Mapping.new(str)
-      
-      mapped_str[0].to_int.should eq 4
-      mapped_str[1].to_int.should eq 1
-      mapped_str[2].to_int.should eq 2
-      mapped_str[3].to_int.should eq 1
-      mapped_str[4].to_int.should eq 4
-      mapped_str[5].to_int.should eq 1
-      mapped_str[6].to_int.should eq 3      
+      mapping = TraceVisualization::Mapping.init do
+        default_tokens
+      end
 
-      length_before = mapped_str.length
+      mapping.process do
+        from_string(str)
+      end
+
+      mapping[0].to_int.should eq 4
+      mapping[1].to_int.should eq 1
+      mapping[2].to_int.should eq 2
+      mapping[3].to_int.should eq 1
+      mapping[4].to_int.should eq 4
+      mapping[5].to_int.should eq 1
+      mapping[6].to_int.should eq 3
+
+      length_before = mapping.length
       
-      sa = TraceVisualization::SuffixArray.effective(mapped_str)
-      mapped_str.length.should be length_before
+      sa = TraceVisualization::SuffixArray.effective(mapping)
+      mapping.length.should be length_before
 
       sa.should eq [1, 5, 3, 2, 6, 0, 4]
-      sa.length.should be mapped_str.length
+      sa.length.should be mapping.length
     end
     
-    it "bug with endless loop" do
+    it 'bug with endless loop' do
       str = "127.0.0.1 user login\r\n127.0.0.1 user logout"
-      mapped_str = TraceVisualization::Mapping.new(str)
+
+      mapping = TraceVisualization::Mapping.init do
+        default_tokens
+      end
+
+      mapping.process do
+        from_string(str)
+      end
       
-      sa = TraceVisualization::SuffixArray.effective(mapped_str)      
+      sa = TraceVisualization::SuffixArray.effective(mapping)
     end    
   end
   

data/trace_visualization.gemspec

@@ -4,32 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trace_visualization/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "trace_visualization"
+  spec.name          = 'trace_visualization'
   spec.version       = TraceVisualization::VERSION
-  spec.authors       = ["Sergey"]
-  spec.email         = ["mastedm@gmail.com"]
+  spec.authors       = ['Sergey']
+  spec.email         = ['mastedm@gmail.com']
   spec.description   = %q{
     Intelligent visualization of software traces    
   }
   spec.summary       = %q{
     Software for smart trace visualization  
   }
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
   
-  spec.add_development_dependency "redcarpet", "~> 1.17"
-  spec.add_development_dependency "yard", "~> 0.7.5"
+  spec.add_development_dependency 'redcarpet', '~> 1.17'
+  spec.add_development_dependency 'yard', '~> 0.7.5'
   
-  spec.add_development_dependency "rspec-core", "~> 2.0"
-  spec.add_development_dependency "rspec-expectations", "~> 2.0"
-  spec.add_development_dependency "rspec-mocks"
-  spec.add_development_dependency "rr", "~> 1.0"  
+  spec.add_development_dependency 'rspec-core', '~> 2.0'
+  spec.add_development_dependency 'rspec-expectations', '~> 2.0'
+  spec.add_development_dependency 'rspec-mocks'
+  spec.add_development_dependency 'rr', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trace_visualization
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sergey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,8 @@ dependencies:
 description: "\n    Intelligent visualization of software traces    \n  "
 email:
 - mastedm@gmail.com
-executables: []
+executables:
+- trace_visualization
 extensions: []
 extra_rdoc_files: []
 files:
@@ -134,6 +135,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/trace_visualization
 - lib/trace_visualization.rb
 - lib/trace_visualization/assert.rb
 - lib/trace_visualization/bwt.rb
@@ -145,18 +147,6 @@ files:
 - lib/trace_visualization/lexeme_overlap_filter.rb
 - lib/trace_visualization/longest_common_prefix.rb
 - lib/trace_visualization/mapping.rb
-- lib/trace_visualization/preprocessor/Makefile
-- lib/trace_visualization/preprocessor/hashmap.c
-- lib/trace_visualization/preprocessor/hashmap.h
-- lib/trace_visualization/preprocessor/hashmap_test.cpp
-- lib/trace_visualization/preprocessor/lexeme.h
-- lib/trace_visualization/preprocessor/lexeme_table.c
-- lib/trace_visualization/preprocessor/lexeme_table.h
-- lib/trace_visualization/preprocessor/lexeme_table_cpp.h
-- lib/trace_visualization/preprocessor/parser_functions.c
-- lib/trace_visualization/preprocessor/parser_test.cpp
-- lib/trace_visualization/preprocessor/preprocessor.l
-- lib/trace_visualization/preprocessor/test_main.cpp
 - lib/trace_visualization/profile.rb
 - lib/trace_visualization/reorder.rb
 - lib/trace_visualization/repetitions.rb
@@ -164,6 +154,7 @@ files:
 - lib/trace_visualization/repetitions_context.rb
 - lib/trace_visualization/repetitions_incrementation.rb
 - lib/trace_visualization/repetitions_psy.rb
+- lib/trace_visualization/repetitions_score.rb
 - lib/trace_visualization/suffix_array.rb
 - lib/trace_visualization/utils.rb
 - lib/trace_visualization/version.rb

data/lib/trace_visualization/preprocessor/Makefile

@@ -1,43 +0,0 @@
-LEX = flex
-CC  = gcc
-CPP = g++
-
-LDFLAGS =-lfl
-
-CPPUNIT_BIN_CFG = cppunit-config
-CPPUNIT_CFLAGS  = `$(CPPUNIT_BIN_CFG) --cflags`
-CPPUNIT_LIBS    = `$(CPPUNIT_BIN_CFG) --libs`
-
-CFLAGS   =-O0 -Wall -g
-CPPFLAGS =-O0 -Wall $(CPPUNIT_CFLAGS) -g
-# CPPFLAGS =-O0 -Wall -std=c++11 $(CPPUNIT_CFLAGS)
-
-.cpp.o :
-	$(CPP) $(CPPFLAGS) -o $@ -c $< 
-
-.c.o :
-	$(CC) $(CFLAGS) -o $@ -c $< 
-
-%.cppo : %.c
-	$(CPP) $(CPPFLAGS) -o $@ -c $< 
-
-preprocessor: preprocessor.o parser_functions.o
-	$(CC) -o $@ $(LDFLAGS) $^
-
-preprocessor.c: preprocessor.l
-	$(LEX) -o $@ $^
-
-unit_tests: test_main.o hashmap.cppo hashmap_test.o \
-            parser_functions.cppo parser_test.o \
-            lexeme_table.cppo
-	$(CPP) -o $@ $(CPPUNIT_LIBS) $^
-	
-unit_tests_run: unit_tests
-	./unit_tests	
-
-install: preprocessor
-	cp preprocessor ../../../bin/
-	make clean
-
-clean: 
-	rm -f *.o *.cppo preprocessor.c unit_tests preprocessor