cf_sim 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cf_sim/control_field_set_finder.rb +4 -8
- data/lib/cf_sim/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a88ac4368605cbd7f57bb925333bd33654c63da7
|
|
4
|
+
data.tar.gz: 0b7bbb29e44345fffe93871e4e8d602482a54124
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 07cebbaea44105b0f1b12ba6ba153bf3e860d07961c76c0ef803c9b3bd66d563d7670dea64bbb082b897b8b4881488b77e2f881b3de84094ccf6a05339295559
|
|
7
|
+
data.tar.gz: a3956c663810f73982d350d9b547315b1ed2041abe7e1aa0be2fed44326a9a2d29eb8fdb1f49fefbcd54e9c2d1ef63e9a59f5f744829eb8e1ea7555fec51232f
|
|
@@ -19,7 +19,8 @@ class CfSim::ControlFieldSetFinder
|
|
|
19
19
|
def find_max_count_fields_list
|
|
20
20
|
@max_count_control_fields_list = []
|
|
21
21
|
find_recursively(CfSim::ControlFieldSet.new, @fields, :max_count)
|
|
22
|
-
@max_count_control_fields_list.sort_by(&:total_area).reverse
|
|
22
|
+
all_list = @max_count_control_fields_list.sort_by(&:total_area).reverse
|
|
23
|
+
@limit_field_count ? all_list[0...@limit_field_count] : all_list
|
|
23
24
|
end
|
|
24
25
|
|
|
25
26
|
private
|
|
@@ -27,7 +28,7 @@ class CfSim::ControlFieldSetFinder
|
|
|
27
28
|
def find_recursively(fields, coexistable_fields, type)
|
|
28
29
|
return if ignore?(fields, coexistable_fields, type)
|
|
29
30
|
|
|
30
|
-
if coexistable_fields.empty?
|
|
31
|
+
if coexistable_fields.empty?
|
|
31
32
|
deploy(fields, type)
|
|
32
33
|
else
|
|
33
34
|
coexistable_fields.each do |field|
|
|
@@ -62,18 +63,13 @@ class CfSim::ControlFieldSetFinder
|
|
|
62
63
|
end
|
|
63
64
|
|
|
64
65
|
def ignore?(fields, coexistable_fields, type)
|
|
65
|
-
field_count = fields.size + coexistable_fields.size
|
|
66
66
|
case type
|
|
67
67
|
when :max_area
|
|
68
68
|
@max_area_control_fields && fields.total_area + coexistable_fields.total_area <= @max_area_control_fields.total_area
|
|
69
69
|
when :max_count
|
|
70
|
-
@max_count_control_fields_list.any? &&
|
|
70
|
+
@max_count_control_fields_list.any? && fields.size + coexistable_fields.size < @max_count_control_fields_list.first.size
|
|
71
71
|
else
|
|
72
72
|
false
|
|
73
73
|
end
|
|
74
74
|
end
|
|
75
|
-
|
|
76
|
-
def limit?
|
|
77
|
-
@limit_field_count && @max_count_control_fields_list && @max_count_control_fields_list.size == @limit_field_count
|
|
78
|
-
end
|
|
79
75
|
end
|
data/lib/cf_sim/version.rb
CHANGED