fractional_expression is now fractional_expression_arithmetic

diff --git a/lib/mint/generator/fractional_expression.rb b/lib/mint/generator/fractional_expression_arithmetic.rb
similarity index 82%
rename from lib/mint/generator/fractional_expression.rb
rename to lib/mint/generator/fractional_expression_arithmetic.rb
index 222da1e..39c57f3 100644 (file)
--- a/lib/mint/generator/fractional_expression.rb
+++ b/lib/mint/generator/fractional_expression_arithmetic.rb
@@ -17,7 +17,7 @@ module Mint::Generator
   #               [factor_min] 整数部の最小値 (ex. 1)
   #               [factor_max] 整数部の最大値 (ex. 9)
   #
-  class FractionalExpression < Base
+  class FractionalExpressionArithmetic < Arithmetic
 
     DEFAULT_OPERATORS = %w[+ - * div]
 
@@ -28,25 +28,17 @@ module Mint::Generator
     def generate_problem
       # TODO: I wanna set option for expression order
       defaults = {
-        :term_number => 2, :operators => DEFAULT_OPERATORS, :x => ['x'],
+        :x => ['x'],
         :numerator_term_number_min   => 1, :numerator_term_number_max   => 1,
         :denominator_term_number_min => 1, :denominator_term_number_max => 1,
         :factor_minus => false, :factor_min => 1, :factor_max => 9,
       }
-      targets = %w[factor denominator_term_number numerator_term_number]
-      @options = min_max_order(options(defaults), targets)
-      expression
+      do_generate(defaults)
     end
 
-    def expression
-      result = []
-      x = options[:x].sample
-      options[:term_number].times do
-        result << fraction(x)
-        result << options[:operators].sample
-      end
-      # except last operator
-      result[0..-2].join(" ")
+    def operand
+      @x ||= options[:x].sample
+      fraction(@x)
     end
 
     def fraction(x)

diff --git a/lib/mint/solver/maxima/fractional_expression.rb b/lib/mint/solver/maxima/fractional_expression_arithmetic.rb
similarity index 75%
rename from lib/mint/solver/maxima/fractional_expression.rb
rename to lib/mint/solver/maxima/fractional_expression_arithmetic.rb
index c310215..8759fd7 100644 (file)
--- a/lib/mint/solver/maxima/fractional_expression.rb
+++ b/lib/mint/solver/maxima/fractional_expression_arithmetic.rb
@@ -2,7 +2,7 @@
 
 module Mint::Solver::Maxima
 
-  class FractionalExpression < Base
+  class FractionalExpressionArithmetic < Base
 
     private
     def solve_problem(problem)

diff --git a/spec/generator/fractional_expression_spec.rb b/spec/generator/fractional_expression_arithmetic_spec.rb
similarity index 93%
rename from spec/generator/fractional_expression_spec.rb
rename to spec/generator/fractional_expression_arithmetic_spec.rb
index d544749..6f6b2d2 100644 (file)
--- a/spec/generator/fractional_expression_spec.rb
+++ b/spec/generator/fractional_expression_arithmetic_spec.rb
@@ -3,9 +3,9 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 module Mint
-  describe Generator::FractionalExpression do
+  describe Generator::FractionalExpressionArithmetic do
 
-    subject{ Generator::FractionalExpression.new }
+    subject{ Generator::FractionalExpressionArithmetic.new }
 
     describe '2 terms' do
 

diff --git a/spec/solver/maxima/fractional_expression_spec.rb b/spec/solver/maxima/fractional_expression_arithmetic_spec.rb
similarity index 87%
rename from spec/solver/maxima/fractional_expression_spec.rb
rename to spec/solver/maxima/fractional_expression_arithmetic_spec.rb
index c20f0f1..37ca276 100644 (file)
--- a/spec/solver/maxima/fractional_expression_spec.rb
+++ b/spec/solver/maxima/fractional_expression_arithmetic_spec.rb
@@ -4,9 +4,9 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Mint::Solver::Maxima
 
-  describe FractionalExpression do
+  describe FractionalExpressionArithmetic do
 
-    subject { FractionalExpression.new }
+    subject { FractionalExpressionArithmetic.new }
 
     [
       ['(x + 2) / (x + 7) * -(x + 5) / (x + 8)', '-(x+2)(x+5)/((x+7)(x+8))'],