activecube 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f1e4575a041108004194789f85b9c030c6f7f94083677dee253de3cc878966
-  data.tar.gz: b182640a584166cefc17b7b26e7add652600b0c937f08b83689a02f819bb2bb9
+  metadata.gz: d0c91dca78a440d0db5b8b0a28531d4c922a9dc81062aad663052afd671a500d
+  data.tar.gz: da104891e98f8cfcb14f91dcc74db0a2e418209e1380baf93a4a03d9653454d0
 SHA512:
-  metadata.gz: ab68fd59fdbffe5e0b3d4b8f0523d351b5a6c2840090328af0e78ed10c7fc23e402335f99f05d114da175c57d0b12f0d4fa02195a89ab52108af451b2dae0445
-  data.tar.gz: ace9d8f215cb59e930cf66249211405408c2bce905166fbe59370708dea17502d40d2416611297a1d6c06d0f6930ee3e73460775cfe1ad32895030db22a49c65
+  metadata.gz: d381b939daec89b03e758a595959fa903ace82f958402c6b7a595b00e28fa1a16593201dc6daec6af99d79faa4e82ab4f76a81c153780eaf890cdc853edbd11b
+  data.tar.gz: d9e9c8d31921dbb6fa43843a35da245594de76182bf85ee207d1bfd19d92ad099ffbe74391ddd0b08d4f3c34aaf443d21a5cbc8b31321a1ae7aa030e88fe1b35

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.24)
+    activecube (0.1.25)
       activerecord (>= 5.2)
 
 GEM

data/lib/activecube/processor/optimizer.rb

@@ -18,7 +18,7 @@ module Activecube::Processor
         @tables_count = cost_matrix.map(&:count).max
         @metrics_count = cost_matrix.count
 
-        tables_count==1 ? [0]*metrics_count : do_optimize
+        (tables_count==1 || metrics_count==0) ? [0]*metrics_count : do_optimize
 
        end
 
@@ -27,95 +27,41 @@ module Activecube::Processor
 
     private
 
-    def do_optimize
+    def generate_variants vs, metric_i
 
-      @tables_by_metrics = []
+      return vs if metric_i==metrics_count
 
-      # sort metrics from low min cost to higher min costs ( by all applicable tables )
-      sort_metrics
+      metric_tables = cost_matrix[metric_i].map.with_index do |c, index|
+        [index] if c
+      end.compact
 
-      # fill initial @tables_by_metrics by selecting tables with minimum cost for metrics.
-      # If there are more than one table with this minimum cost, then select already selected table with maximum cost
-      select_min_cost_by_metric
+      vsnew = if metric_i==0
+         metric_tables
+      else
+        arry = []
+        vs.each do |v|
+          metric_tables.each{|newv|
+            arry << (v + newv)
+          }
+        end
+        arry
+      end
 
-      # make iterations over @tables_by_metrics ( max MAX_ITERATIONS)
-      iterates
+      generate_variants vsnew, metric_i+1
 
-      @tables_by_metrics
     end
 
-    def sort_metrics
-      @metrics_index_sorted = (0...metrics_count).sort_by{|m_i| cost_matrix[m_i].compact.min || UNLIM_COST }
+    def cost_for variant
+      variant.each_with_index.group_by(&:first).collect do |table_index, arry|
+        arry.map(&:second).map{|metric_index| cost_matrix[metric_index][table_index] }.max
+      end.sum
     end
 
-    def select_min_cost_by_metric
-
-      @metrics_index_sorted.collect do |m_i|
-
-        table_index_cost = (0...tables_count).map{|c_i| [c_i,
-                                                        cost_matrix[m_i][c_i] || UNLIM_COST,
-                                                        (@tables_by_metrics.include?(c_i) ? -cost_matrix[@tables_by_metrics.index(c_i)][c_i] : 0)
-        ]}.sort_by(&:third).sort_by(&:second)
-
-        @tables_by_metrics[m_i] = table_index_cost.first.first
-
-      end
-    end
-
-    def iterates
-
-      steps = [@tables_by_metrics]
-
-      (1..MAX_ITERATIONS).each do |iteration|
-
-        step = []
-        prev_step = steps.last
-
-        prev_step.each_with_index {|c_i, m_i|
-
-          table_included_times = prev_step.select{|c| c==c_i }.count
-          old_cost = cost_matrix[m_i][c_i]
-          new_c_i = (0...tables_count).detect{|c_n|
-            new_cost = cost_matrix[m_i][c_n]
-            next if c_i==c_n || new_cost.nil?
-            new_table_included_times = prev_step.select{|c| c==c_n }.count
-
-            if old_cost.nil?
-              # if we have non indexed table now
-              true
-            elsif table_included_times>1
-              if new_table_included_times>0
-                # table to used table if
-                # cost now > new cost
-                old_cost > new_cost
-              else
-                # table to unused table if
-                # cost now > new cost + max other cost in table now
-                old_cost > new_cost + ( prev_step.select.with_index{|c,i| c==c_i && i!=m_i }.map{|c| cost_matrix[m_i][c]}.max || UNLIM_COST )
-              end
-            else
-              if new_table_included_times>0
-                # unused table to table if
-                # new cost <  cost now + max other cost in new table
-                old_cost > new_cost - ( prev_step.select{|c| c==c_n }.map{|c| cost_matrix[m_i][c]}.max || UNLIM_COST )
-              else
-                # unused to unused
-                # cost now > new cost
-                old_cost > new_cost
-              end
-            end
-
-          }
-
-          step << (new_c_i || c_i)
-
-        }
-
-        break if steps.include? step
-        steps << step
-      end
+    def do_optimize
 
-      @tables_by_metrics = steps.last
+      variants = generate_variants [], 0
+      variant_costs = variants.map{|v| cost_for v}
+      variants[variant_costs.each_with_index.min.second]
 
     end
 

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Aleksey Studnev