classbench 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36de8ab8ecd1c0cf26aba7cf4313975fac9d853c
-  data.tar.gz: eff25cbca6958cc159171bb801312409c87f2281
+  metadata.gz: 0476c25d8f3928d4d671593eb0008199838443a1
+  data.tar.gz: af9f48ef68198ea312cf5bf2c7e7f7264df1ddee
 SHA512:
-  metadata.gz: a2aedb99efd751401e1fbb73c534b78ca4e59779266e4088733cc318accaca03b9d46574ba3cad044d37f82e33f734a4cca6ef612914c2c0406cb27a7724f88f
-  data.tar.gz: 72594c05c6fa23843e776de0cd071f5cad30fbb2b114f9a8db03ac92579e657e1b4e4d1d8f085f44ed0f8073bd0c82282d3d9a22cb43474bde0e6dc39c5bd8dc
+  metadata.gz: 7df7583555c764b29b9a3b2bfa496fe58f20350b22f449d83bda3a09242c4eea79b2361306a301781cd32904be09ae2de8b34ebfb9dc8c04938cb7bb5e93431a
+  data.tar.gz: 470d1129f07c85f2db6081a419db550cd9ff096aa5879748b2fade35e80b189424df2165b302de5f441aceb984b23ce892514d815b0edc24da1e368c987c6c7a

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/classbench.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: classbench 0.0.3 ruby lib
+# stub: classbench 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "classbench"
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adam Lucansky", "Gianni Antichi", "Jiri Matousek"]
-  s.date = "2015-06-20"
+  s.date = "2015-06-21"
   s.description = "Statistical generation of firewall/OpenFLOW rules based on seed file (IN DEVELOPMENT)"
   s.email = "adamlucansky@gmail.com"
   s.extra_rdoc_files = [
@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "classbench.gemspec",
     "lib/classbench.rb",
-    "lib/classbench/tier.rb",
-    "lib/classbench/tier_node.rb",
+    "lib/classbench/trie.rb",
+    "lib/classbench/trie_node.rb",
     "test/helper.rb",
     "test/test_classbench.rb",
     "test/test_docopt.rb"

data/lib/classbench/trie.rb

@@ -0,0 +1,92 @@
+module Classbench
+
+	# Structure representing trie statistics proposed in the ClassBench tool.
+	#
+	# Array members store statistics defined separately for each level of the
+	# trie. Prefix nesting is defined for the whole trie.
+	Struct.new("ClassbenchStats",
+					# (float[]) number of prefixes (not prefix nodes) with given length
+					:prefix_lengths,
+					# (float[]) probability of node with only one child (from all non-leaf nodes),
+					:branching_one_child,
+					# (float[]) probability of node with two children (from all non-leaf nodes)
+					:branching_two_children,
+					# (float[]) average relative weight ratio of lighter vs heavier subtree (nodes with two children only)
+					:skew,
+					# (int) maximum number of prefix nodes on an arbitrary path in the trie
+					:prefix_nesting)
+
+
+	# Structure representing statistics related to trie nodes.
+	#
+	# All the statistics are stored separately for each level of the trie.
+	Struct.new("NodeStats",
+				:leaf,          # (int[]) number of leaf nodes
+				:one_child,     # (int[]) number of nodes with one child only
+				:two_children,  # (int[]) number of nodes with both children
+				:prefix,        # (int[]) number of prefix nodes (not prefixes)
+				:non_prefix     # (int[]) number of non-prefix nodes
+				)
+
+	# Structure representing statistics related to the trie.
+	#
+	# Statistics are divided into two groups:
+	#    1) statistics proposed in ClassBench tool and
+	#    2) statistics related to trie nodes.
+	#
+	Struct.new("TrieStats", :classbench_stats, :node_stats)
+
+	# Class for representation of a n-ary prefix tree - trie.
+	class Trie
+		attr_accessor :root
+
+		def initialize
+		end
+
+		def insert(prefix)
+			self.root = TrieNode.new(0) if not root
+
+			# Empty prefix
+			if prefix.size == 0
+				root.increment_prefixes
+				return
+			end
+
+			current_node = self.root
+			next_node = nil
+
+			# For each char
+			prefix.split('').each_with_index do |ch, i|
+				next_node = current_node.subtree[ch]
+
+				if next_node.nil?
+					next_node = TrieNode.new(i+1)
+					current_node.subtree[ch] = next_node
+				end
+
+				current_node = next_node
+			end
+
+			current_node.increment_prefixes
+		end
+
+		# Erase not implemented/neccessary
+
+		def get_stats
+			return if not root
+			root.compute_weights
+
+			level = root.level
+
+			que = [root]
+			# BFS, append from right, take from left
+			while not que.empty?
+				node = que.shift # take one from left
+
+				node.subtree.each do |char, subnode|
+					que << subnode
+				end
+			end
+		end
+	end
+end

data/lib/classbench/{tier_node.rb → trie_node.rb}

@@ -1,8 +1,8 @@
-class TierNode
+class TrieNode
 	attr_accessor :level           # depth of node
 	attr_accessor :prefixes_count  # number of occurences of the prefix
 
-	attr_accessor :subtree # Hash mapping character -> TierNode
+	attr_accessor :subtree # Hash mapping character -> TrieNode
 	attr_accessor :subtree_weights
 
 	def initialize(level)

data/lib/classbench.rb

@@ -1,11 +1,26 @@
-require 'classbench/tier'
-require 'classbench/tier_node'
+require 'classbench/trie'
+require 'classbench/trie_node'
+
+require 'pp'
 
 module Classbench
+	def self.generate_prefix
+		len = rand(33)
+
+		(0...len).map { [0,1][rand(2)]}.join
+	end
+
 	def self.hi
-		#puts "Hello world"
-		t = Tier.new
-		t.insert "1010000"
+		t = Trie.new
+		#2.times { t.insert "101" }
+		#3.times { t.insert "100" }
+		500_000.times { t.insert generate_prefix }
+		puts "Stats"
+		t.get_stats
+
+		puts "Done"
+
+
 
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classbench
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Adam Lucansky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -72,8 +72,8 @@ files:
 - VERSION
 - classbench.gemspec
 - lib/classbench.rb
-- lib/classbench/tier.rb
-- lib/classbench/tier_node.rb
+- lib/classbench/trie.rb
+- lib/classbench/trie_node.rb
 - test/helper.rb
 - test/test_classbench.rb
 - test/test_docopt.rb

data/lib/classbench/tier.rb

@@ -1,42 +0,0 @@
-module Classbench
-
-	# Class for representation of a n-ary prefix tree - trie.
-	class Tier
-		attr_accessor :root
-
-		def insert(prefix)
-			self.root = TierNode.new(0) if not root
-
-			# Empty prefix
-			if prefix.size == 0
-				root.increment_prefixes
-				return
-			end
-
-			current_node = self.root
-			next_node = nil
-
-			# For each char
-			prefix.split('').each_with_index do |ch, i|
-				next_node = current_node.subtree[ch]
-
-				if next_node.nil?
-					next_node = TierNode.new(i+1)
-					current_node.subtree[ch] = next_node
-				end
-
-				current_node = next_node
-			end
-
-			current_node.increment_prefixes
-		end
-
-		# Erase not implemented/neccessary
-
-		def get_stats
-			return if not root
-
-			root.compute_weights
-		end
-	end
-end