multidim minimization namings changed

Author: lasandun

lib/brent_root_finder.rb

@@ -94,11 +94,5 @@ def find_root(lo, hi, f)
         end
       end
     end
-
   end
-
 end
-
-#root = Minimization::BrentRootFinder.new(nil)
-#func = proc{|x| (x-3.5872)**2}
-#puts root.find_root(0, 5, func)

lib/conjugate_gradient_minimizer.rb renamed to lib/conjugate_gradient.rb

@@ -146,14 +146,14 @@ def brent_search(point, direction)
   # == Usage.
   #  require 'minimization'
   #  f = proc{ |x| (x[0] - 1)**2 + (2*x[1] - 5)**2 + (x[2]-3.3)**2}
-  #  min = Minimization::PowellMinimizer.new(f, [1, 2, 3], [0, 0, 0], [5, 5, 5])
+  #  min = Minimization::Powell.new(f, [1, 2, 3], [0, 0, 0], [5, 5, 5])
   #  while(min.converging?)
   #    min.minimize
   #  end
   #  min.f_minimum
   #  min.x_minimum
   #
-  class PowellMinimizer < ConjugateDirectionMinimizer
+  class Powell < ConjugateDirectionMinimizer
 
     attr_accessor :relative_threshold
     attr_accessor :absolute_threshold

lib/powell.rb

@@ -1,4 +1,4 @@
-require "./../lib/conjugate_gradient_minimizer.rb"
+require "./../lib/conjugate_gradient.rb"
 
 describe Minimization::NonLinearConjugateGradientMinimizer do
 

spec/minimization_conjugate_gradient_fletcher_reeves.rb

@@ -1,4 +1,4 @@
-require "./../lib/conjugate_gradient_minimizer.rb"
+require "./../lib/conjugate_gradient.rb"
 
 describe Minimization::NonLinearConjugateGradientMinimizer do
 

spec/minimization_conjugate_gradient_polak_ribiere.rb

@@ -1,6 +1,6 @@
 require "./../lib/powell.rb"
 
-describe Minimization::PowellMinimizer do
+describe Minimization::Powell do
   before :all do
     @n           = 3
     @limit       = 100
@@ -18,22 +18,22 @@
 
     # example 1
     f = proc{ |x| (x[0] - @p[0])**2 + (x[1] - @p[1])**2 + (x[2] - @p[2])**2 }
-    @min1 = Minimization::PowellMinimizer.new(f, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
+    @min1 = Minimization::Powell.new(f, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
     while(@min1.converging?)
       @min1.minimize
     end
 
     # example 2
     @k = rand(@limit)
     f2 = proc{ |x| ( @p[0]*x[0] + @p[1]*x[1] + @p[2]*x[2] )**2 +  @k}
-    @min2 = Minimization::PowellMinimizer.new(f2, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
+    @min2 = Minimization::Powell.new(f2, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
     while(@min2.converging?)
       @min2.minimize
     end
 
     # example 3 : unidimensional
     f3 = proc{ |x| (x[0] - @p[0])**2 + @k}
-    @min3 = Minimization::PowellMinimizer.new(f3, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
+    @min3 = Minimization::Powell.new(f3, @start_point, [-@limit, -@limit, -@limit], [@limit, @limit, @limit])
     while(@min3.converging?)
       @min3.minimize
     end