cf_sim 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9378e236733ed66fb70343fa5e33c508cfdba69f
-  data.tar.gz: 603031535dbc93e9dacc2ec9fce5f6415f9e6ba4
+  metadata.gz: d3d7ff63871865339c874b0881b6b27cd07b3d52
+  data.tar.gz: 17824ed6f4e9c9b39eb037e6138d06ba401633da
 SHA512:
-  metadata.gz: 4a7aca9a5cf5bae58b1e715c8276f9faee4418718f00fd7230a34a877ef59631e911dffc1e03af3bf34796aedc36955b68ffc85a890640ab4f2458a738904683
-  data.tar.gz: aca9a38f0f726005d54b7a40cb3901dabb27551cf6521af330523a5f44233b2339633b1a1a2114b2b6b2425ea8d34f23275b0f8d20a86676534c7b4e6eecfcc9
+  metadata.gz: 194c9d438fa7d835cb2b2c27b856046250909170f1eb24111dbc3345226e7a35e63b0b203efd21bf934cc4920b2bd1966b8b98245760dac589af309d2f2eb6a1
+  data.tar.gz: 28560304774e952dcd6ca050150cf20e2dc3f2789aa73b41efe94da1206af4afc4148b74b2ac55f0fcb341df39adfeb2af2ce76bbee7ee224495ec0095ec7ea0

data/README.md

@@ -2,9 +2,7 @@
 [![Build Status](https://travis-ci.org/pinzolo/cf_sim.svg)](http://travis-ci.org/pinzolo/cf_sim)
 [![Coverage Status](https://coveralls.io/repos/pinzolo/cf_sim/badge.png)](https://coveralls.io/r/pinzolo/cf_sim)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/cf_sim`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+ポータルを列挙したデータファイルから多重CFのURLを出力するシミュレータ
 
 ## Installation
 
@@ -24,7 +22,26 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### 指定のファイルに列挙されたポータルから作成できる最大面積の多重CFのURLを出力する
+
+```sh
+cf_sim max_area <data_file>
+```
+
+### 指定のファイルに列挙されたポータルから作成できる最大枚数の多重CFのURLを面積順に出力する
+
+```sh
+# あるだけ出力
+cf_sim max_count <data_file>
+
+# 面積の大きい順から10個出力
+cf_sim max_count <data_file> 10
+```
+
+### ポータルデータファイルの書式
+
+各行が `緯度,経度,ポータル名` の CSV ファイル（[参考](test/data_file.txt)）
+ただし、ポータル名は必須ではない
 
 ## Development
 

data/lib/cf_sim/cli.rb

@@ -8,9 +8,9 @@ class CfSim::CLI < Thor
     puts @generator.fields_link(fields)
   end
 
-  desc 'max_count DATA_FILE', 'print max count control fields URL list.'
-  def max_count(data_file)
-    finder = load_finder_from(data_file)
+  desc 'max_count DATA_FILE LIMIT', 'print max count control fields URL list.'
+  def max_count(data_file, limit = nil)
+    finder = load_finder_from(data_file, limit ? limit.to_i : nil)
     fields_list = finder.find_max_count_fields_list
     max_area = fields_list.first.total_area
     fields_list.each do |fields|
@@ -21,11 +21,11 @@ class CfSim::CLI < Thor
 
   private
 
-  def load_finder_from(data_file)
+  def load_finder_from(data_file, limit)
     portals = CfSim::DataFileParser.new(data_file).parse
     portal_map = CfSim::PortalMap.new(portals)
     @generator = CfSim::IntelMapUrlGenerator.new(portal_map)
-    CfSim::ControlFieldSetFinder.new(CfSim::PointList.new(portal_map.points).creatable_fields)
+    CfSim::ControlFieldSetFinder.new(CfSim::PointList.new(portal_map.points).creatable_fields, limit_field_count: limit)
   end
 end
 

data/lib/cf_sim/control_field_set_finder.rb

@@ -2,10 +2,12 @@ require 'cf_sim/coexistable_field_map'
 require 'cf_sim/control_field_set'
 
 class CfSim::ControlFieldSetFinder
-  def initialize(fields, limit_field_count = 1)
+  def initialize(fields, options = {})
     @fields = CfSim::ControlFieldSet.new(fields.sort_by(&:area).reverse)
     @coexistable_field_map = CfSim::CoexistableFieldMap.new(@fields)
-    @limit_field_count = limit_field_count
+    @limit_field_count = options[:limit_field_count] || nil
+    @max_count_control_fields_list = []
+    @max_area_control_fields = nil
   end
 
   def find_max_area_fields
@@ -14,12 +16,6 @@ class CfSim::ControlFieldSetFinder
     @max_area_control_fields
   end
 
-  def find_all_fields_list
-    @control_fields_list = []
-    find_recursively(CfSim::ControlFieldSet.new, @fields, :all)
-    @control_fields_list
-  end
-
   def find_max_count_fields_list
     @max_count_control_fields_list = []
     find_recursively(CfSim::ControlFieldSet.new, @fields, :max_count)
@@ -31,7 +27,7 @@ class CfSim::ControlFieldSetFinder
   def find_recursively(fields, coexistable_fields, type)
     return if ignore?(fields, coexistable_fields, type)
 
-    if coexistable_fields.empty?
+    if coexistable_fields.empty? || limit?
       deploy(fields, type)
     else
       coexistable_fields.each do |field|
@@ -44,8 +40,6 @@ class CfSim::ControlFieldSetFinder
     case type
     when :max_area
       replace_if_max(fields)
-    when :all
-      append_to_list(fields, @control_fields_list)
     when :max_count
       append_or_create_if_max_count(fields)
     end
@@ -72,12 +66,14 @@ class CfSim::ControlFieldSetFinder
     case type
     when :max_area
       @max_area_control_fields && fields.total_area + coexistable_fields.total_area <= @max_area_control_fields.total_area
-    when :all
-      field_count < @limit_field_count
     when :max_count
-      field_count < @limit_field_count && @max_count_control_fields_list.any? && field_count < @max_count_control_fields_list.first.size
+      @max_count_control_fields_list.any? && field_count < @max_count_control_fields_list.first.size
     else
       false
     end
   end
+
+  def limit?
+    @limit_field_count && @max_count_control_fields_list && @max_count_control_fields_list.size == @limit_field_count
+  end
 end

data/lib/cf_sim/version.rb

@@ -1,3 +1,3 @@
 module CfSim
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf_sim
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - pinzolo