24games 0.2.3 → 0.2.4

data/bin/24games

@@ -6,22 +6,22 @@ require 'calc24'
 require 'calc24/version'
 
 begin
-  digits = []
+  numbers = []
   
   raise Calc24::VERSION if ['--version', '-v'].include? ARGV[0]
   
   if ARGV.count == 1 and ARGV[0].size == 4
     ARGV[0].each_char do |c|
-      digits << c
+      numbers << c.to_i
     end
   elsif ARGV.count == 4
-    digits = ARGV.to_i
+    numbers = ARGV.to_i
   else
     raise "    inputs 4 numbers such as: 5959 or 5 9 5 9"
   end
   
   t0 = Time.now 
-  player = Calc24::TwentyFourGamePlayer.new(digits)
+  player = Calc24::TwentyFourGamePlayer.new(numbers)
 
   if player.solutions.empty?
     puts "no solutions"

data/lib/calc24/calc24_core.rb

@@ -125,16 +125,16 @@ module Calc24
 
     @@objective = Rational(24,1)
    
-    def initialize(digits)
-      @digits = digits
+    def initialize(numbers)
+      @numbers = numbers
       @solutions = {}
       solve
     end
    
-    attr_reader :digits, :solutions
+    attr_reader :numbers, :solutions
    
     def solve
-      digits.permutation.to_a.uniq.each do |a,b,c,d|
+      numbers.permutation.to_a.uniq.each do |a,b,c,d|
         MAN4D4S.each do |expr|
           # evaluate using rational arithmetic
           test = expr.gsub('%d', 'Rational(%d,1)') % [a, b, c, d]

data/lib/calc24/ext.rb

@@ -1,24 +1,28 @@
 class Array
   def to_i
-    self.map do |arg| 
-      begin
-        case arg.upcase
-          when 'J' then 11
-          when 'Q' then 12
-          when 'K' then 13
-          when 'A' then 1
-          else Integer(arg)
-        end
-      rescue ArgumentError
-        raise "    unknown digit: '#{arg}'"
-      end
+    self.map do |char| 
+      char.to_i
     end
   end
 end
 
 class String
+  def to_i
+    begin
+      case self.upcase
+        when 'J' then 11
+        when 'Q' then 12
+        when 'K' then 13
+        when 'A' then 1
+        else Integer(self)
+      end
+    rescue ArgumentError
+      raise "    unknown number: '#{self}'"
+    end
+  end
+  
   def to_p
-    {'11' => 'J', '12' => 'Q', '13' => 'K'}.each {|digit, poker| self.gsub!(digit, poker)}
+    {'11' => 'J', '12' => 'Q', '13' => 'K'}.each {|number, poker| self.gsub!(number, poker)}
     self
   end
 end

data/lib/calc24/version.rb

@@ -1,3 +1,3 @@
 module Calc24
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 24games
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies: []
 description: computes an expression to solve the 24 game if possible.
 email:
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 24games
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: 24 game/Solve