danica 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3aa11c78083f2cf4dbf106b5edc4ae7370dc2a
-  data.tar.gz: d16d37bfebfd039a1469dec4029f927cd5374fed
+  metadata.gz: d9452b255fbf76168b5420387cfc63e578f61e2d
+  data.tar.gz: 52e4a1dc89abe24a06b337d6fee11a09670455d4
 SHA512:
-  metadata.gz: ec1d1e75b021be3608dd5f2aae2662fc8104d9cbd4b10e27fb4d6ca8aeb8c5c09542e58443799284c30965f4d3d5b5d2d5f5dbd659645c7b36d87b143f1d933a
-  data.tar.gz: de6db957793d4f43a74b5c9c311ed82cafdd6f016dbe260b7d09d66418297d1d35eacf47a6909d8376efaf3ab33f3201c190d5bc48e40dcbe546b1a6d1729083
+  metadata.gz: 8e703c6ebbecb67468d686145e91546209a1330c68e2f02992313b7255ea6439970fdd817addaa00e0f88e9bf6cece0fdb00ce0c1ea7c9e99d383ac3b48c4fef
+  data.tar.gz: 3e495695b72e62546b941d7a6838657574dbd54bc94044177dd90c39a77dbad1170cac77ccea7be96eaa9843145f68789f3e0b2c7e543db50dc86320ea873f05

data/README.md

@@ -41,12 +41,12 @@ class MyOperator < Danica::Operator
 
   private
 
-  def tex_string
-    #implement tex_string here
+  def to_tex
+    #implement to_tex here
   end
 
-  def gnu_string
-    #implement gnu_string here
+  def to_gnu
+    #implement to_gnu here
   end
 end
 ```
@@ -61,11 +61,11 @@ class Danica::Inverse
 
   private
 
-  def tex_string
+  def to_tex
     "(#{value.to_tex})^{-1}"
   end
 
-  def gnu_string
+  def to_gnu
     "(#{value.to_gnu}) ** -1"
   end
 end

data/lib/danica/common.rb

@@ -10,18 +10,6 @@ module Danica
       raise 'Not IMplemented yet'
     end
   
-    def to_tex
-      Number.new(to_f).to_tex
-    rescue Exception::NotDefined
-      tex_string
-    end
-
-    def to_gnu
-      Number.new(to_f).to_gnu
-    rescue Exception::NotDefined
-      gnu_string
-    end
-  
     def variables=(variables)
       @variables = variables.map { |v| wrap_value(v) }
     end
@@ -49,14 +37,6 @@ module Danica
     def non_valued_variables
       variables.reject(&:valued?)
     end
-
-    def tex_string
-      raise 'Not IMplemented yet'
-    end
-
-    def gnu_string
-      raise 'Not IMplemented yet'
-    end
   
     def wrap_value(value)
       return Number.new(value) if value.is_a?(Numeric)

data/lib/danica/cos.rb

@@ -6,13 +6,11 @@ module Danica
       Math.cos(variable.to_f)
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "cos(#{variable.to_tex})"
     end
 
-    def gnu_string
+    def to_gnu
       "cos(#{variable.to_gnu})"
     end
   end

data/lib/danica/division.rb

@@ -6,13 +6,11 @@ module Danica
       numerator.to_f / denominator.to_f
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "\\frac{#{numerator.to_tex}}{#{denominator.to_tex}}"
     end
 
-    def gnu_string
+    def to_gnu
       "#{numerator.to_gnu}/#{denominator.to_gnu}"
     end
   end

data/lib/danica/exponential.rb

@@ -6,13 +6,11 @@ module Danica
       Math.exp(exponent.to_f)
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "e^{#{exponent.to_tex}}"
     end
 
-    def gnu_string
+    def to_gnu
       "exp(#{exponent.to_gnu})"
     end
   end

data/lib/danica/group.rb

@@ -11,10 +11,12 @@ module Danica
     end
 
     def to_tex
-      "(#{value.to_tex})"
+      "\\left(#{value.to_tex}\\right)"
     end
 
-    alias_method :to_gnu, :to_tex
+    def to_gnu
+      "(#{value.to_gnu})"
+    end
   end
 end
 

data/lib/danica/operator/chained.rb

@@ -10,27 +10,19 @@ module Danica
         variables.include?(value)
       end
 
-      private
-
-      def repack(other)
-        other_variables = other.is_a?(self.class) ? other.variables : [ other ]
-        self.class.new(variables + other_variables)
-      end
-
-      def tex_string
-        (numeric_to_tex + non_numeric_variables.map(&:to_tex)).join(" #{tex_symbol} ")
+      def to_tex
+        variables.map(&:to_tex).join(" #{tex_symbol} ")
       end
 
-      def gnu_string
-        (numeric_to_tex + non_numeric_variables.map(&:to_gnu)).join(" #{gnu_symbol} ")
+      def to_gnu
+        variables.map(&:to_gnu).join(" #{gnu_symbol} ")
       end
 
-      def numeric_variables
-        variables.select { |v| v.valued? }
-      end
+      private
 
-      def non_numeric_variables
-        variables.reject { |v| v.valued? }
+      def repack(other)
+        other_variables = other.is_a?(self.class) ? other.variables : [ other ]
+        self.class.new(variables + other_variables)
       end
 
       def chain(numbers)
@@ -38,11 +30,6 @@ module Danica
           chain_operation(a,b)
         end.to_f
       end
-
-      def numeric_to_tex
-        return [] if numeric_variables.empty?
-        [ Number.new(chain(numeric_variables.map(&:to_f))).to_tex ]
-      end
     end
   end
 end

data/lib/danica/power.rb

@@ -6,13 +6,11 @@ module Danica
       base.to_f ** exponent.to_f
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "#{base.to_tex}^{#{exponent.to_tex}}"
     end
 
-    def gnu_string
+    def to_gnu
       "#{base.to_gnu}**#{exponent.to_gnu}"
     end
   end

data/lib/danica/sin.rb

@@ -6,13 +6,11 @@ module Danica
       Math.sin(variable.to_f)
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "sin(#{variable.to_tex})"
     end
 
-    def gnu_string
+    def to_gnu
       "sin(#{variable.to_gnu})"
     end
   end

data/lib/danica/squared_root.rb

@@ -6,13 +6,11 @@ module Danica
       Math.sqrt(variable.to_f)
     end
 
-    private
-
-    def tex_string
+    def to_tex
       "\\sqrt{#{variable.to_tex}}"
     end
 
-    def gnu_string
+    def to_gnu
       "sqrt(#{variable.to_gnu})"
     end
   end

data/lib/danica/sum.rb

@@ -12,13 +12,11 @@ module Danica
       '+'
     end
 
-    def gnu_symbol
-      '+'
-    end
-
     def chain_operation(a, b)
       a + b
     end
+
+    alias_method :gnu_symbol, :tex_symbol
   end
 end
 

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/spec/lib/danica/cos_spec.rb

@@ -9,7 +9,8 @@ describe Danica::Cos do
   it_behaves_like 'a operator with a single input value', {
     variable_value: Math::PI,
     expected_number: -1.0,
-    expected_number_text: '-1',
+    expected_number_tex: 'cos(3.141592653589793)',
+    expected_number_gnu: 'cos(3.141592653589793)',
     expected_tex: 'cos(X)',
     expected_gnu: 'cos(X)'
   }

data/spec/lib/danica/division_spec.rb

@@ -12,12 +12,12 @@ describe Danica::Division do
     calculated: 1.0 / 2.0,
     to_tex: {
       string_expected: '\frac{X1}{X2}',
-      numeric_string_expected: '0.5',
+      numeric_string_expected: '\frac{2}{4}',
       partial_string_expected: '\frac{2}{X2}'
     },
     to_gnu: {
       string_expected: 'X1/X2',
-      numeric_string_expected: '0.5',
+      numeric_string_expected: '2/4',
       partial_string_expected: '2/X2'
     }
   }

data/spec/lib/danica/exponential_spec.rb

@@ -9,7 +9,8 @@ describe Danica::Exponential do
   it_behaves_like 'a operator with a single input value', {
     variable_value: 2,
     expected_number: Math.exp(2),
-    expected_number_text: Math.exp(2).to_s,
+    expected_number_tex: 'e^{2}',
+    expected_number_gnu: 'exp(2)',
     expected_tex: 'e^{X}',
     expected_gnu: 'exp(X)'
   }

data/spec/lib/danica/function_spec.rb

@@ -231,7 +231,7 @@ describe Danica::Function do
 
     describe '#to_tex' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { '\frac{1}{\sqrt{6.283185307179586 \cdot v^{2}}} \cdot e^{-\frac{(x + -u)^{2}}{2 \cdot v^{2}}}'  }
+        let(:expected) { '\frac{1}{\sqrt{2 \cdot \pi \cdot v^{2}}} \cdot e^{-\frac{\left(x + -u\right)^{2}}{2 \cdot v^{2}}}'  }
 
         it 'return the latex format CAM' do
           expect(subject.to_tex).to eq(expected)
@@ -241,7 +241,7 @@ describe Danica::Function do
 
     describe '#to_gnu' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { '1/sqrt(6.283185307179586 * v**2) * exp(-(x + -u)**2/2 * v**2)' }
+        let(:expected) { '1/sqrt(2 * pi * v**2) * exp(-(x + -u)**2/2 * v**2)' }
 
         it 'return the latex format CAM' do
           expect(subject.to_gnu).to eq(expected)

data/spec/lib/danica/power_spec.rb

@@ -12,12 +12,12 @@ describe Danica::Power do
     calculated: 9.0,
     to_tex: {
       string_expected: 'X1^{X2}',
-      numeric_string_expected: '9',
+      numeric_string_expected: '3^{2}',
       partial_string_expected: '3^{X2}'
     },
     to_gnu: {
       string_expected: 'X1**X2',
-      numeric_string_expected: '9',
+      numeric_string_expected: '3**2',
       partial_string_expected: '3**X2'
     }
   }

data/spec/lib/danica/product_spec.rb

@@ -22,13 +22,13 @@ describe Danica::Product do
     numeric_variables: [ 1.5, 2, 3.5 ],
     to_tex: { 
       string_expected: %w(X1 X2 X3 X4).join(' \cdot '),
-      integer_expected: %w(3 X3 X4).join(' \cdot '),
-      float_expected: '10.5 \cdot X4'
+      integer_expected: %w(1.5 2 X3 X4).join(' \cdot '),
+      float_expected: %w(1.5 2 3.5 X4).join(' \cdot ')
     },
     to_gnu: {
       string_expected: %w(X1 X2 X3 X4).join(' * '),
-      integer_expected: %w(3 X3 X4).join(' * '),
-      float_expected: '10.5 * X4'
+      integer_expected: %w(1.5 2 X3 X4).join(' * '),
+      float_expected: %w(1.5 2 3.5 X4).join(' * '),
     }
   }
 end

data/spec/lib/danica/sin_spec.rb

@@ -9,7 +9,8 @@ describe Danica::Sin do
   it_behaves_like 'a operator with a single input value', {
     variable_value: Math::PI / 2.0,
     expected_number: 1.0,
-    expected_number_text: '1',
+    expected_number_tex: 'sin(1.5707963267948966)',
+    expected_number_gnu: 'sin(1.5707963267948966)',
     expected_tex: 'sin(X)',
     expected_gnu: 'sin(X)'
   }

data/spec/lib/danica/squared_root_spec.rb

@@ -9,7 +9,8 @@ describe Danica::SquaredRoot do
   it_behaves_like 'a operator with a single input value', {
     variable_value: 9,
     expected_number: 3.0,
-    expected_number_text: '3',
+    expected_number_tex: '\sqrt{9}',
+    expected_number_gnu: 'sqrt(9)',
     expected_tex: '\sqrt{X}',
     expected_gnu: 'sqrt(X)'
   }

data/spec/lib/danica/sum_spec.rb

@@ -23,16 +23,16 @@ describe Danica::Sum do
 
   it_behaves_like 'a operator that joins many variables with same operation', {
     calculated: 10,
-    numeric_variables: [ 1.5, 2.5, 3.5 ],
+    numeric_variables: [ 1.5, 3.0, 3.5 ],
     to_tex: {
       string_expected: 'X1 + X2 + X3 + X4',
-      integer_expected: '4 + X3 + X4',
-      float_expected: '7.5 + X4'
+      integer_expected: '1.5 + 3 + X3 + X4',
+      float_expected: '1.5 + 3 + 3.5 + X4'
     },
     to_gnu: {
       string_expected: 'X1 + X2 + X3 + X4',
-      integer_expected: '4 + X3 + X4',
-      float_expected: '7.5 + X4'
+      integer_expected: '1.5 + 3 + X3 + X4',
+      float_expected: '1.5 + 3 + 3.5 + X4'
     }
   }
 end

data/spec/support/shared_examples/operator/chained.rb

@@ -90,14 +90,14 @@ shared_examples 'a operator that knows how to write to a string' do |command, ar
         end
       end
 
-      it 'outputs a text format with colapsed numbers' do
+      it 'outputs a text format of numbers' do
         expect(subject.public_send(command)).to eq(integer_expected)
       end
 
-      context 'when numeric variables calculated is a float value' do
+      context 'when numeric variables are a float value' do
         let(:numeric_variables_index) { 2 }
 
-        it 'outputs a text format with colapsed numbers' do
+        it 'outputs a text format of numbers' do
           expect(subject.public_send(command)).to eq(float_expected)
         end
       end

data/spec/support/shared_examples/operator/dual_term.rb

@@ -36,7 +36,7 @@ shared_examples 'a operator that has two terms and knows how to calculate it' do
       end
     end
 
-    context 'when one the variables are numbers' do
+    context 'when one of the variables is number' do
       before do
         variables[0] = values[0]
       end

data/spec/support/shared_examples/operator/single_input.rb

@@ -1,5 +1,5 @@
 shared_examples 'a operator with a single input value' do |arguments|
-  include_context 'variables are initialized', arguments, *%w(variable_value expected_number expected_tex expected_number_text expected_gnu)
+  include_context 'variables are initialized', arguments, *%w(variable_value expected_number expected_tex expected_number_tex expected_gnu expected_number_gnu)
   let(:variable) { { name: "X", value: variable_value } }
   subject { described_class.new(variable) }
 
@@ -41,7 +41,7 @@ shared_examples 'a operator with a single input value' do |arguments|
         subject.variables[0].value = variable_value
       end
       it 'prints both numbers' do
-        expect(subject.to_tex).to eq(expected_number_text)
+        expect(subject.to_tex).to eq(expected_number_tex)
       end
     end
   end
@@ -60,7 +60,7 @@ shared_examples 'a operator with a single input value' do |arguments|
         subject.variables[0].value = variable_value
       end
       it 'prints both numbers' do
-        expect(subject.to_gnu).to eq(expected_number_text)
+        expect(subject.to_gnu).to eq(expected_number_gnu)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Darthjee