rb_maxima 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f8a7781dde39239a581fe9e88b9d127b93bdd7225bb027b361950c84f7ad6a
-  data.tar.gz: 5393dfa5952b36216eb717a7b47c00ac8cc144f96815c60675f29ef68fa224be
+  metadata.gz: a94090141028eea6bf1d0ffdcf9262333a7fd052de88503e6893def622e51344
+  data.tar.gz: 444426905a43c8ab5379c0573383d9621ef5d2aef34121ab6970ce70a2120934
 SHA512:
-  metadata.gz: 9d195381e9231e60d11f5dc9b2f814e69a4478e79e2fd45185e459b3866c6e626c22c1b4c0741e63984f8ee68939589acd1ec1077dc91ae93032a9a46392d83d
-  data.tar.gz: 287a8b6257429192fb76706750eecbe1a1eade21a0d55da9dce3f8f586bd31a9d8da6ba45e845382d93f172ca20aaf54904db26a38b0afdbe0b518059fe86932
+  metadata.gz: 0b28b6aceac03844a0d3cfbbff19ab982086a44c3e0d167dc4dd659783d75f41ca65cdde989bb671cb09d5543344a84f51152416b76c0326eb5b9d374cd8a924
+  data.tar.gz: 90da4e7f1b39ec540c385ce8acf631e67b72ae1bec4b3ce3e6cf65281557b1f1a87eddd1c8dac6c191de87a28b2c522ceb37364df0629900123a1cf8312fc6f7

data/lib/maxima/function.rb

@@ -10,7 +10,9 @@ module Maxima
     end
 
     # This strategy fails for functions (cos etc.). However, that does not impact it's actual usage.
-    VARIABLE_REGEX = /[%|a-z|A-Z]+/.freeze
+    VARIABLE_REGEX = /[%|a-z|A-Z]+[0-9|a-z|A-Z]*/.freeze
+    VARIABLE_REGEX_LOOK_PATTERN = /[%|0-9|a-z|A-Z]/
+    VARIABLE_REPLACEMENT_REGEX = ->(variable) { /(?<!#{VARIABLE_REGEX_LOOK_PATTERN})#{variable}(?!#{VARIABLE_REGEX_LOOK_PATTERN})/ }
     IGNORE_VARIABLES = %w(%e %i).freeze
     def self.variables_in_string(string)
       (string.scan(VARIABLE_REGEX) - IGNORE_VARIABLES).to_set
@@ -74,12 +76,12 @@ module Maxima
         v.each do |k,t|
           k = k.to_s
           if @variables.include?(k)
-            s.gsub!(k, "(#{t})")
+            s.gsub!(VARIABLE_REPLACEMENT_REGEX.call(k), "(#{t})")
           end
         end
       else
         throw :must_specify_variables_in_hash if @variables.length != 1
-        s.gsub!(@variables.first, "(#{v})")
+        s.gsub!(VARIABLE_REPLACEMENT_REGEX.call(@variables.first), "(#{v})")
       end
       Function.parse(s).simplified
     end

data/lib/maxima/polynomial.rb

@@ -3,37 +3,32 @@ module Maxima
 
     def self.fit(histogram, degrees)
       throw :degrees_must_be_zero_or_positive if degrees < 0
-      degrees += 1
 
       equation_string, variables = polynomial_equation(degrees)
       results = Maxima.lsquares_estimation(histogram.to_a, [:x, :y], "y = #{equation_string}", variables)
-      mse = results.delete(:mse)
 
-      results.each do |variable, value|
-        equation_string.gsub!("(#{variable})", value.to_s)
-      end
+      function = Maxima::Function.new(equation_string)
 
       {
-        function: Maxima::Function.new(equation_string).simplified,
-        mse: mse
+        mse:      results.delete(:mse),
+        function: function.at(results),
       }
     end
 
     def self.polynomial_equation(degrees, f_of: "x")
-      polynomials = []
-      constant_variables = []
+      polynomials, constant_variables = [], []
 
-      degrees.times.each do |degree|
+      (degrees + 1).times.each do |degree|
         constant_variable = "c#{degree}"
         constant_variables << constant_variable
 
         case degree
         when 0
-          polynomials << "(#{constant_variable})"
+          polynomials << constant_variable
         when 1
-          polynomials << "(#{constant_variable}) * #{f_of}"
+          polynomials << "#{constant_variable} * #{f_of}"
         else
-          polynomials << "(#{constant_variable}) * #{f_of} ^ #{degree}"
+          polynomials << "#{constant_variable} * #{f_of} ^ #{degree}"
         end
       end
 

data/lib/maxima/version.rb

@@ -1,3 +1,3 @@
 module Maxima
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_maxima
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Ackerman