commendo 1.2.4 → 2.0.0

data/test/tests_for_tag_sets.rb

@@ -0,0 +1,130 @@
+module TestsForTagSets
+
+  def test_adds_tags_for_resource
+    assert_equal [], @ts.get(1)
+    @ts.add(1, 'foo', 'bar', 'baz')
+    expected = @ts.get(1)
+    assert_equal %w(bar baz foo).sort, expected.sort
+    @ts.add(1, 'qux', 'qip')
+    expected = @ts.get(1)
+    assert_equal %w(bar baz foo qip qux).sort, expected.sort
+  end
+
+  def test_isolates_by_key_base
+    ts1 = create_tag_set('TagSetOne')
+    ts2 = create_tag_set('TagSetTwo')
+    assert_equal [], ts1.get(1)
+    assert_equal [], ts2.get(1)
+
+    ts1.add(1, 'foo', 'bar', 'baz')
+
+    assert_equal %w(bar baz foo).sort, ts1.get(1).sort
+    assert_equal [], ts2.get(1)
+
+    ts2.add(1, 'qux', 'qip')
+    assert_equal %w(bar baz foo).sort, ts1.get(1).sort
+    assert_equal %w(qux qip).sort, ts2.get(1).sort
+  end
+
+  def test_empty?
+    assert @ts.respond_to? :empty?
+    assert @ts.empty?
+    @ts.add(1, 'qux', 'qip')
+    refute @ts.empty?
+    @ts.delete(1)
+    assert @ts.empty?
+  end
+
+  def test_sets_tags_for_resource
+    assert_equal [], @ts.get(1)
+    @ts.set(1, 'foo', 'bar', 'baz')
+    assert_equal %w(bar baz foo).sort, @ts.get(1).sort
+    @ts.set(1, 'qux', 'qip')
+    assert_equal %w(qip qux).sort, @ts.get(1).sort
+  end
+
+  def test_sets_tags_when_empty
+    @ts.set(1, 'foo', 'bar', 'baz')
+    @ts.set(2, 'qux', 'qip')
+    assert_equal %w(bar baz foo).sort, @ts.get(1).sort
+    assert_equal %w(qip qux).sort, @ts.get(2).sort
+    @ts.set(1, *[])
+    assert_equal [], @ts.get(1)
+    assert_equal %w(qip qux).sort, @ts.get(2).sort
+  end
+
+  def test_deletes_all_tags_for_resource
+    @ts.set(1, 'foo', 'bar', 'baz')
+    @ts.set(2, 'qux', 'qip')
+    assert_equal %w(bar baz foo).sort, @ts.get(1).sort
+    assert_equal %w(qip qux).sort, @ts.get(2).sort
+    @ts.delete(1)
+    assert_equal [], @ts.get(1)
+    assert_equal %w(qip qux).sort, @ts.get(2).sort
+  end
+
+  def test_deletes_given_tags_for_resource
+    assert_equal [], @ts.get(1)
+    @ts.set(1, 'foo', 'bar', 'baz', 'qux', 'qip')
+    @ts.delete(1, 'qux', 'qip')
+    assert_equal %w(bar baz foo).sort, @ts.get(1).sort
+  end
+
+  def test_matches_tags
+    @ts.set(1, 'foo', 'bar', 'baz')
+    @ts.set(2, 'qux', 'qip')
+
+    assert @ts.matches(1, ['foo'])
+    assert @ts.matches(1, %w(bar baz))
+    assert @ts.matches(1, %w(bar baz foo))
+    refute @ts.matches(1, ['qux'])
+    refute @ts.matches(1, ['qip'])
+
+    refute @ts.matches(2, ['foo'])
+    refute @ts.matches(2, %w(bar baz))
+    refute @ts.matches(2, %w(bar baz foo))
+    assert @ts.matches(2, %w(qux qip))
+    assert @ts.matches(2, ['qux'])
+    assert @ts.matches(2, ['qip'])
+  end
+
+  def test_matches_exclude_tags
+    @ts.set(1, 'foo', 'bar', 'baz')
+    @ts.set(2, 'qux', 'qip')
+
+    refute @ts.matches(1, nil, ['foo'])
+    refute @ts.matches(1, [], ['foo'])
+    refute @ts.matches(1, [], %w(bar baz))
+    refute @ts.matches(1, [], %w(bar baz foo))
+    assert @ts.matches(1, [], ['qux'])
+    assert @ts.matches(1, [], ['qip'])
+
+    assert @ts.matches(2, nil, ['foo'])
+    assert @ts.matches(2, [], ['foo'])
+    assert @ts.matches(2, [], %w(bar baz))
+    assert @ts.matches(2, [], %w(bar baz foo))
+    refute @ts.matches(2, [], %w(qux qip))
+    refute @ts.matches(2, [], ['qux'])
+    refute @ts.matches(2, [], ['qip'])
+  end
+
+  def test_matches_include_and_exclude_tags
+    @ts.set(1, 'foo', 'bar', 'baz')
+    @ts.set(2, 'qux', 'qip')
+
+    refute @ts.matches(1, ['foo'], ['bar'])
+    refute @ts.matches(1, ['bar'], ['foo'])
+
+    assert @ts.matches(1, ['foo'], [])
+    assert @ts.matches(1, ['foo'], nil)
+    assert @ts.matches(1, ['foo'], ['qux'])
+
+    assert @ts.matches(2, ['qip'], ['foo'])
+    assert @ts.matches(2, ['qux'], %w(bar baz))
+    assert @ts.matches(2, ['qip'], %w(bar baz foo))
+    refute @ts.matches(2, ['qip'], %w(qux qip))
+    refute @ts.matches(2, ['qip'], ['qux'])
+    refute @ts.matches(2, ['qux'], ['qip'])
+  end
+
+end

data/test/tests_for_weighted_groups.rb

@@ -0,0 +1,106 @@
+module TestsForWeightedGroups
+
+  def test_calls_each_content_set
+    expected = [
+        {resource: '6', similarity: 74.037},
+        {resource: '12', similarity: 55.5},
+        {resource: '9', similarity: 6.67},
+        {resource: '3', similarity: 4.0},
+        {resource: '21', similarity: 2.86},
+        {resource: '15', similarity: 2.86}
+    ]
+    assert_equal expected, @weighted_group.similar_to(18)
+  end
+
+  def test_calls_each_content_set_with_limits
+    expected = [
+        {resource: '6', similarity: 74.037},
+        {resource: '12', similarity: 55.5},
+        {resource: '9', similarity: 6.67},
+        {resource: '3', similarity: 4.0},
+        {resource: '21', similarity: 2.86},
+        {resource: '15', similarity: 2.86}
+    ]
+    assert_equal expected[0..0], @weighted_group.similar_to(18, 1)
+    assert_equal expected[0..2], @weighted_group.similar_to(18, 3)
+    assert_equal expected, @weighted_group.similar_to(18, 6)
+    assert_equal expected, @weighted_group.similar_to(18, 99)
+  end
+
+  def test_filters_include_recommendations
+    expected = [{resource: '15', similarity: 2.86}]
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected, @weighted_group.filtered_similar_to(18, include: ['mod5'])
+  end
+
+  def test_filters_exclude_recommendations
+    expected = [
+        {resource: '6', similarity: 74.037},
+        {resource: '12', similarity: 55.5},
+        {resource: '9', similarity: 6.67},
+        {resource: '3', similarity: 4.0}
+    ]
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected, @weighted_group.filtered_similar_to(18, exclude: ['mod5', 'mod7'])
+  end
+
+  def test_filters_include_and_exclude_recommendations
+    expected = [
+        {resource: '16', similarity: 0.8},
+        {resource: '4', similarity: 0.667},
+        {resource: '12', similarity: 0.333}
+    ]
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected, @weighted_group.filtered_similar_to(8, include: ['mod4'], exclude: ['mod5'])
+  end
+
+  def test_filters_include_and_exclude_recommendations_and_limits
+    expected = [
+        {resource: '16', similarity: 0.8},
+        {resource: '4', similarity: 0.667},
+        {resource: '12', similarity: 0.333}
+    ]
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected[0..0], @weighted_group.filtered_similar_to(8, include: ['mod4'], exclude: ['mod5'], limit: 1)
+    assert_equal expected[0..1], @weighted_group.filtered_similar_to(8, include: ['mod4'], exclude: ['mod5'], limit: 2)
+    assert_equal expected, @weighted_group.filtered_similar_to(8, include: ['mod4'], exclude: ['mod5'], limit: 3)
+    assert_equal expected, @weighted_group.filtered_similar_to(8, include: ['mod4'], exclude: ['mod5'], limit: 99)
+  end
+
+  def test_similar_to_mutliple_items
+    expected = [
+        {resource: '12', similarity: 78.437},
+        {resource: '18', similarity: 78.037},
+        {resource: '9', similarity: 11.67},
+        {resource: '21', similarity: 9.0},
+        {resource: '15', similarity: 9.0},
+        {resource: '6', similarity: 6.67},
+        {resource: '3', similarity: 6.67},
+        {resource: '8', similarity: 0.667},
+        {resource: '16', similarity: 0.5},
+        {resource: '20', similarity: 0.4}
+    ]
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected, @weighted_group.similar_to([3, 4, 5, 6, 7])
+  end
+
+  def test_filtered_similar_to_mutliple_items
+    expected = [
+        {resource: '12', similarity: 78.437},
+        {resource: '8', similarity: 0.667},
+        {resource: '16', similarity: 0.5},
+    ]
+
+    @weighted_group.tag_set = @tag_set
+    assert_equal expected, @weighted_group.filtered_similar_to([3, 4, 5, 6, 7], include: ['mod4'], exclude: ['mod5'])
+  end
+
+  def test_weightings_affect_scores
+    skip
+  end
+
+  def test_precalculates
+    skip
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commendo
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Rob Styles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,16 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
-description: A Jaccard-similarity recommender using Redis sets
+description: A Jaccard-similarity recommender using Redis sets or MySQL
 email:
 - rob.styles@dynamicorange.com
 executables:
+- commendo-create-mysql-db
+- commendo-create.sql
 - commendo-find-identical-pairs
 - commendo-load
 - commendo-load-tags-tsv
 - commendo-load-tsv
+- commendo-load-tsv-mysql.rb
 - commendo-recommendations-distribution
 - commendo-similarity-distribution
+- commendo-time-mysql.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -127,23 +159,44 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/commendo-create-mysql-db
+- bin/commendo-create.sql
 - bin/commendo-find-identical-pairs
 - bin/commendo-load
 - bin/commendo-load-tags-tsv
 - bin/commendo-load-tsv
+- bin/commendo-load-tsv-mysql.rb
 - bin/commendo-recommendations-distribution
 - bin/commendo-similarity-distribution
+- bin/commendo-time-mysql.rb
 - commendo.gemspec
 - lib/commendo.rb
+- lib/commendo/configuration.rb
 - lib/commendo/content_set.rb
-- lib/commendo/pair_comparison.lua
-- lib/commendo/similarity.lua
+- lib/commendo/mysql-backed/content_set.rb
+- lib/commendo/mysql-backed/tag_set.rb
+- lib/commendo/mysql-backed/weighted_group.rb
+- lib/commendo/redis-backed/content_set.rb
+- lib/commendo/redis-backed/pair_comparison.lua
+- lib/commendo/redis-backed/similarity.lua
+- lib/commendo/redis-backed/tag_set.rb
+- lib/commendo/redis-backed/weighted_group.rb
 - lib/commendo/tag_set.rb
 - lib/commendo/version.rb
 - lib/commendo/weighted_group.rb
-- test/content_set_test.rb
-- test/tag_set_test.rb
-- test/weighted_group_test.rb
+- lib/mysql2/client.rb
+- model 2.mwb
+- sql_model.mwb
+- test/configuration_test.rb
+- test/mysql_content_set_test.rb
+- test/mysql_tag_set_test.rb
+- test/mysql_weighted_group_test.rb
+- test/redis_content_set_test.rb
+- test/redis_tag_set_test.rb
+- test/redis_weighted_group_test.rb
+- test/tests_for_content_sets.rb
+- test/tests_for_tag_sets.rb
+- test/tests_for_weighted_groups.rb
 homepage: ''
 licenses:
 - MIT
@@ -167,9 +220,16 @@ rubyforge_project:
 rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
-summary: A Jaccard-similarity recommender using Redis sets
+summary: A Jaccard-similarity recommender using Redis sets or MySQL
 test_files:
-- test/content_set_test.rb
-- test/tag_set_test.rb
-- test/weighted_group_test.rb
+- test/configuration_test.rb
+- test/mysql_content_set_test.rb
+- test/mysql_tag_set_test.rb
+- test/mysql_weighted_group_test.rb
+- test/redis_content_set_test.rb
+- test/redis_tag_set_test.rb
+- test/redis_weighted_group_test.rb
+- test/tests_for_content_sets.rb
+- test/tests_for_tag_sets.rb
+- test/tests_for_weighted_groups.rb
 has_rdoc: 

data/test/content_set_test.rb

@@ -1,408 +0,0 @@
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'minitest/mock'
-require 'mocha/setup'
-require 'commendo'
-
-module Commendo
-
-  class ContentSetTest < Minitest::Test
-
-    def setup
-      @redis = Redis.new(db: 15)
-      @redis.flushdb
-      @key_base = 'CommendoTests'
-      @cs = ContentSet.new(@redis, @key_base)
-    end
-
-    def test_gives_similarity_key_for_resource
-      key_base = 'CommendoTestsFooBarBaz'
-      cs = ContentSet.new(@redis, key_base)
-      assert_equal 'CommendoTestsFooBarBaz:similar:resource-1', cs.similarity_key('resource-1')
-    end
-
-    def test_recommends_when_added
-      @cs.add('resource-1', 'group-1', 'group-2')
-      @cs.add('resource-2', 'group-1')
-      @cs.add('resource-3', 'group-1', 'group-2')
-      @cs.add('resource-4', 'group-2')
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-3', similarity: 1.0},
-        {resource: 'resource-4', similarity: 0.667},
-        {resource: 'resource-2', similarity: 0.667}
-      ]
-      assert_equal expected, @cs.similar_to('resource-1')
-    end
-
-    def test_recommends_limited_by_number
-      @cs.add('resource-1', 'group-1', 'group-2')
-      @cs.add('resource-2', 'group-1')
-      @cs.add('resource-3', 'group-1', 'group-2')
-      @cs.add('resource-4', 'group-2')
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-3', similarity: 1.0},
-        {resource: 'resource-4', similarity: 0.667},
-        {resource: 'resource-2', similarity: 0.667}
-      ]
-      assert_equal expected[0..0], @cs.similar_to('resource-1', 1)
-      assert_equal expected[0..1], @cs.similar_to('resource-1', 2)
-      assert_equal expected, @cs.similar_to('resource-1', 3)
-      assert_equal expected, @cs.similar_to('resource-1', 99)
-    end
-
-    def test_recommends_when_added_with_scores
-      @cs.add('resource-1', ['group-1', 2], ['group-2', 2])
-      @cs.add('resource-2', ['group-1', 7])
-      @cs.add('resource-3', ['group-1', 2], ['group-2', 2])
-      @cs.add('resource-4', ['group-2', 3])
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-3', similarity: 1.0},
-        {resource: 'resource-2', similarity: 0.818},
-        {resource: 'resource-4', similarity: 0.714}
-      ]
-      assert_equal expected, @cs.similar_to('resource-1')
-    end
-
-    def test_recommends_with_large_number_of_groups
-      (0..3000).each do |i|
-        @cs.add('resource-1', ["group-#{i}", i/100.0], ["group-#{i+1}", i/20.0])
-        @cs.add('resource-9', ["group-#{i}", i/100.0], ["group-#{i+1}", i/20.0])
-      end
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-9', similarity: 1.0}
-      ]
-      assert_equal expected, @cs.similar_to('resource-1')
-    end
-
-    def test_recommends_when_extra_scores_added
-      test_recommends_when_added_with_scores #sets up the content set
-      @cs.add('resource-3', ['group-1', 1], ['group-3', 2])
-      @cs.add('resource-4', ['group-2', 1])
-      @cs.add_by_group('group-1', ['newource-9', 100], 'resource-2', 'resource-3')
-      @cs.add_by_group('group-2', 'resource-1', 'resource-3', 'resource-4')
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'newource-9', similarity: 1.0},
-        {resource: 'resource-1', similarity: 0.769},
-        {resource: 'resource-3', similarity: 0.706}
-      ]
-      assert_equal expected, @cs.similar_to('resource-2')
-    end
-
-    def test_recommends_when_added_by_group
-      @cs.add_by_group('group-1', 'resource-1', 'resource-2', 'resource-3')
-      @cs.add_by_group('group-2', 'resource-1', 'resource-3', 'resource-4')
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-3', similarity: 1.0},
-        {resource: 'resource-4', similarity: 0.667},
-        {resource: 'resource-2', similarity: 0.667}
-      ]
-      assert_equal expected, @cs.similar_to('resource-1')
-    end
-
-    def test_recommends_when_added_by_group_with_scores
-      @cs.add_by_group('group-1', ['resource-1', 2], ['resource-2', 3], ['resource-3', 7])
-      @cs.add_by_group('group-2', ['resource-1', 2], ['resource-3', 3], ['resource-4', 5])
-      @cs.calculate_similarity
-      expected = [
-        {resource: 'resource-3', similarity: 1.0},
-        {resource: 'resource-4', similarity: 0.778},
-        {resource: 'resource-2', similarity: 0.714}
-      ]
-      assert_equal expected, @cs.similar_to('resource-1')
-    end
-
-    def test_recommendations_are_isolated_by_key_base
-      skip
-    end
-
-    def test_recommendations_are_isolated_by_redis_db
-      skip
-    end
-
-    def test_calculates_similarity_scores
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add_by_group(group, res) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity
-      expected = [
-        {resource: '9', similarity: 0.667},
-        {resource: '6', similarity: 0.667},
-        {resource: '12', similarity: 0.5},
-        {resource: '3', similarity: 0.4},
-        {resource: '21', similarity: 0.286},
-        {resource: '15', similarity: 0.286}
-      ]
-      assert_equal expected, @cs.similar_to(18)
-    end
-
-    def test_calculates_with_threshold
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add_by_group(group, res) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity(0.4)
-      expected = [
-        {resource: '9', similarity: 0.667},
-        {resource: '6', similarity: 0.667},
-        {resource: '12', similarity: 0.5}
-      ]
-      assert_equal expected, @cs.similar_to(18)
-    end
-
-    def test_calculate_copes_with_missing_resource
-      @cs.calculate_similarity_for_resource('999999999999', 0.1)
-    end
-
-    def test_calculate_yields_after_each
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add_by_group(group, res) if res % group == 0
-        end
-      end
-      expected_keys = ['CommendoTests:resources:3', 'CommendoTests:resources:4', 'CommendoTests:resources:5', 'CommendoTests:resources:6', 'CommendoTests:resources:7', 'CommendoTests:resources:8', 'CommendoTests:resources:9', 'CommendoTests:resources:10', 'CommendoTests:resources:11', 'CommendoTests:resources:12', 'CommendoTests:resources:13', 'CommendoTests:resources:14', 'CommendoTests:resources:15', 'CommendoTests:resources:16', 'CommendoTests:resources:17', 'CommendoTests:resources:18', 'CommendoTests:resources:19', 'CommendoTests:resources:20', 'CommendoTests:resources:21', 'CommendoTests:resources:22', 'CommendoTests:resources:23']
-      actual_keys = []
-      @cs.calculate_similarity { |key, index, total|
-        actual_keys << key
-      }
-      assert_equal expected_keys.sort, actual_keys.sort
-    end
-
-    def test_deletes_resource_from_everywhere
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add_by_group(group, res) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity
-      assert similar_to(@cs, 18, 12)
-
-      @cs.delete(12)
-      assert_equal [], @cs.similar_to(12)
-      refute similar_to(@cs, 18, 12)
-
-      @cs.calculate_similarity
-      assert_equal [], @cs.similar_to(12)
-      refute similar_to(@cs, 18, 12)
-    end
-
-    def test_remove_from_groups
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-        end
-      end
-      resource = 20
-      assert_equal ['4','5','10','20'].sort!, @cs.groups(resource).sort!
-      @cs.remove_from_groups(resource, 10)
-      assert_equal ['4','5','20'].sort!, @cs.groups(resource).sort!
-      @cs.remove_from_groups(resource, 4)
-      assert_equal ['5','20'].sort!, @cs.groups(resource).sort!
-    end
-
-    def test_remove_causes_similarity_to_change_when_recalculated
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity
-      assert similar_to(@cs, 18, 12)
-      @cs.remove_from_groups(18, 6, 3)
-      @cs.calculate_similarity
-      refute similar_to(@cs, 18, 12)
-    end
-
-    def test_accepts_incremental_updates
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity
-      assert similar_to(@cs, 18, 12)
-      refute similar_to(@cs, 10, 12)
-
-      @cs.add_and_calculate(12, 'foo', true)
-      @cs.add_and_calculate(10, 'foo', true)
-      assert similar_to(@cs, 10, 12)
-    end
-
-    def test_remove_and_calculate
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-        end
-      end
-      @cs.calculate_similarity
-      assert similar_to(@cs, 18, 12)
-      @cs.remove_from_groups_and_calculate(18, 6, 3)
-      refute similar_to(@cs, 18, 12)
-    end
-
-    def test_filters_include_by_tag_collection
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-
-      actual = @cs.filtered_similar_to(10, include: ['mod5'])
-      assert_equal 3, actual.length
-      assert contains_resource('5', actual)
-      assert contains_resource('15', actual)
-      assert contains_resource('20', actual)
-
-    end
-
-    def test_filters_include_by_tag_collection_and_limit
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-
-      actual = @cs.filtered_similar_to(10, include: ['mod5'], limit: 2)
-      assert_equal 2, actual.length
-      assert contains_resource('5', actual)
-      #assert contains_resource('15', actual)
-      assert contains_resource('20', actual)
-
-    end
-
-    def test_filters_exclude_by_tag_collection
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-
-      actual = @cs.filtered_similar_to(10, exclude: ['mod3'])
-      assert_equal 2, actual.length
-      assert contains_resource('5', actual)
-      assert contains_resource('20', actual)
-      refute contains_resource('15', actual)
-    end
-
-    def test_filters_includes_and_exclude_by_tag_collection
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      #Build some test data
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-
-      actual = @cs.filtered_similar_to(12, include: ['mod4'], exclude: ['mod3', 'mod5'])
-      assert_equal 3, actual.length
-
-      refute contains_resource('6', actual)
-      refute contains_resource('18', actual)
-      assert contains_resource('4', actual)
-      refute contains_resource('3', actual)
-      refute contains_resource('9', actual)
-      assert contains_resource('8', actual)
-      refute contains_resource('21', actual)
-      assert contains_resource('16', actual)
-      refute contains_resource('15', actual)
-      refute contains_resource('20', actual)
-    end
-
-    def test_recommends_for_many
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-      expected = [
-        {resource: '18', similarity: 1.834},
-        {resource: '3', similarity: 1.734},
-        {resource: '6', similarity: 1.167},
-        {resource: '21', similarity: 1.086},
-        {resource: '15', similarity: 1.086},
-        {resource: '12', similarity: 1.0},
-        {resource: '9', similarity: 0.833},
-        {resource: '4', similarity: 0.4},
-        {resource: '8', similarity: 0.333},
-        {resource: '16', similarity: 0.286},
-        {resource: '20', similarity: 0.25}
-      ]
-      actual = @cs.similar_to([12, 6, 9])
-      assert_equal expected, actual
-      #, include: ['mod4'], exclude: ['mod3', 'mod5']
-    end
-
-    def test_recommends_for_many_applies_filters
-      ts = TagSet.new(@redis, "#{@key_base}:tags")
-      @cs = ContentSet.new(@redis, @key_base, ts)
-      (3..23).each do |group|
-        (3..23).each do |res|
-          @cs.add(res, group) if res % group == 0
-          ts.add(res, 'mod3') if res.modulo(3).zero?
-          ts.add(res, 'mod4') if res.modulo(4).zero?
-          ts.add(res, 'mod5') if res.modulo(5).zero?
-        end
-      end
-      @cs.calculate_similarity
-      actual = @cs.filtered_similar_to([12, 6, 9], include: ['mod4'], exclude: ['mod3', 'mod5'])
-      refute contains_resource('6', actual)
-      refute contains_resource('18', actual)
-      assert contains_resource('4', actual)
-      refute contains_resource('3', actual)
-      refute contains_resource('9', actual)
-      assert contains_resource('8', actual)
-      refute contains_resource('21', actual)
-      assert contains_resource('16', actual)
-      refute contains_resource('15', actual)
-      refute contains_resource('20', actual)
-    end
-
-    def similar_to(cs, resource, similar)
-      contains_resource(similar, cs.similar_to(resource))
-    end
-
-    def contains_resource(resource, similarities)
-      !similarities.select { |sim| sim[:resource] == "#{resource}" }.empty?
-    end
-
-  end
-
-end