danica 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696be3ea582e6da09c966a3093aa11d62a26f0f5
-  data.tar.gz: 07b3928209584450ad5b502087bafa160c34ac33
+  metadata.gz: d679c98744cf0b50bc7cdb70cb70e2d08c99dc29
+  data.tar.gz: d21601f2005622dd2cb2ef9248c1fc42ee4bc9b7
 SHA512:
-  metadata.gz: 3ccbabcfd60cfc8f69ccf95ece082fdbfb998eb67b5f4d25ee466adbdd2a14b2f17c7c236a9aba891b59ada13729589ed9c605ff89426486e95ea34b90ecac8b
-  data.tar.gz: a5f0d985343c2c22344c0e7f9b624b0cb104819fa486900d595863cf7587a3914117ddb27ee62fb01c0af856d7e77dbc97ea125bfe542301334398de089669f9
+  metadata.gz: 9b1add172a4a3486cd170bd410a163c613684a6c96897be6b83be1cbe3525e02d78f8efcb259cef544f4ed518460a47fbf545ead9849f6749b97a696083705c3
+  data.tar.gz: e2402e6dbcd8b71f8ed81c9029aba06ab87a418239a7927ec54f7a631cc1a0d4bb8116d1bf8e477e4cb1e0804197dde9353d50f68c07b3183a26fdcebe2071ff

data/.gitignore

@@ -1 +1,3 @@
 coverage
+pkg
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danica (0.1.0)
+    danica (0.2.0)
       activemodel
       activesupport
 

data/README.md

@@ -50,19 +50,26 @@ class Danica::Function
       ]
     end
 
-    def spatial_velocity
-      Product.new(variables: [ initial_velocity, time ])
+    def spatial_acceleration
+      Division.new(numerator: Product.new(variables: [ acceleration, time_squared ]), denominator: 2)
     end
 
-    def spatial_acceleration
-      Division.new(numerator: Product.new(variables: [ acceleration, time, time ]), denominator: 2)
+    def time_squared
+      Power.new(base: time, exponent: 2)
     end
   end
 end
+
+Danica::Function.new(
+  time: :t,
+  acceleration: 'a',
+  initial_space: { name: :S0, latex: 'S_0' },
+  initial_velocity: { name: :V0, latex: 'V_0' }
+).to_tex
 ```
 
 returns
 ```string
-S_0 + V_0 \cdot t + \frac{a \cdot t \cdot t}{2}
+S_0 + V_0 \cdot t + \frac{a \cdot t^2}{2}
 ```
 

data/lib/danica/function.rb

@@ -5,6 +5,7 @@ class Danica::Function
   require 'danica/function/product'
   require 'danica/function/sum'
   require 'danica/function/division'
+  require 'danica/function/power'
 
   attr_accessor :name, :variables
 
@@ -29,6 +30,9 @@ class Danica::Function
   private
 
   def wrap_value(value)
-    value.is_a?(Numeric) ? Danica::Number.new(value) : value
+    return Danica::Number.new(value) if value.is_a?(Numeric)
+    return Danica::Variable.new(value) if value.is_a?(Hash)
+    return Danica::Variable.new(name: value) if [ String, Symbol ].any? { |c| value.is_a?(c) }
+    value
   end
 end

data/lib/danica/function/division.rb

@@ -1,7 +1,7 @@
 module Danica
   class Function
     class Division < Function
-      attr_accessor :numerator, :denominator
+      attr_reader :numerator, :denominator
 
       def to_f
         numerator.to_f / denominator.to_f
@@ -12,11 +12,11 @@ module Danica
       end
 
       def numerator=(value)
-        @numerator ||= wrap_value(value)
+        @numerator = wrap_value(value)
       end
 
       def denominator=(value)
-        @denominator ||= wrap_value(value)
+        @denominator = wrap_value(value)
       end
     end
   end

data/lib/danica/function/power.rb

@@ -0,0 +1,24 @@
+module Danica
+  class Function
+    class Power < Function
+      attr_reader :base, :exponent
+
+      def to_f
+        base.to_f ** exponent.to_f
+      end
+
+      def to_tex
+        [ base, exponent ].map(&:to_tex).join('^')
+      end
+
+      def base=(value)
+        @base = wrap_value(value)
+      end
+
+      def exponent=(value)
+        @exponent = wrap_value(value)
+      end
+    end
+  end
+end
+

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/lib/danica/function/division_spec.rb

@@ -5,7 +5,7 @@ describe Danica::Function::Division do
   let(:values) { [ 2, 4 ] }
   let(:variables) do
     [ 1, 2 ].map do |i|
-      Danica::Variable.new(name: "X#{i}", value: values[i-1])
+      { name: "X#{i}", value: values[i-1] }
     end
   end
   let(:subject) do
@@ -53,9 +53,7 @@ describe Danica::Function::Division do
   describe 'to_tex' do
     context 'when variables have no value' do
       let(:variables) do
-        [ 1,2 ].map do |i|
-          Danica::Variable.new(name: "X#{i}")
-        end
+        [ 1,2 ].map { |i| "X#{i}" }
       end
 
       it 'returns a latex format fraction' do
@@ -65,7 +63,7 @@ describe Danica::Function::Division do
 
     context 'when one of the variables has value' do
       before do
-        variables[1].value = nil
+        subject.denominator.value = nil
       end
 
       it 'returns the number instead of the value' do
@@ -81,8 +79,8 @@ describe Danica::Function::Division do
 
     context 'when one of the variables is a number' do
       before do
-        variables[1].value = nil
         variables[0] = 1
+        subject.denominator.value = nil
       end
 
       it 'prints both numbers' do

data/spec/lib/danica/function/power_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Danica::Function::Power do
+  let(:variables_number) { 4 }
+  let(:values) { [ 3, 2 ] }
+  let(:variables) do
+    [ 1, 2 ].map do |i|
+      { name: "X#{i}", value: values[i-1] }
+    end
+  end
+  let(:subject) do
+    described_class.new(base: variables[0], exponent: variables[1])
+  end
+
+  describe 'to_f' do
+    context 'when variables are not numbers but have value' do
+      it 'returns the division of the values' do
+        expect(subject.to_f).to eq(9.0)
+      end
+
+      it do
+        expect(subject.to_f).to be_a(Float)
+      end
+    end
+
+    context 'when all the variables are numbers' do
+      let(:variables) { [ 3, 2 ] }
+
+      it 'returns the division of the values' do
+        expect(subject.to_f).to eq(9.0)
+      end
+
+      it do
+        expect(subject.to_f).to be_a(Float)
+      end
+    end
+
+    context 'when one the variables are numbers' do
+      before do
+        variables[0] = 3
+      end
+
+      it 'returns the division of the values' do
+        expect(subject.to_f).to eq(9.0)
+      end
+
+      it do
+        expect(subject.to_f).to be_a(Float)
+      end
+    end
+  end
+
+  describe 'to_tex' do
+    context 'when variables have no value' do
+      let(:variables) do
+        [ 1,2 ].map { |i| "X#{i}" }
+      end
+
+      it 'returns a latex format fraction' do
+        expect(subject.to_tex).to eq('X1^X2')
+      end
+    end
+
+    context 'when one of the variables has value' do
+      before do
+        subject.exponent.value = nil
+      end
+
+      it 'returns the number instead of the value' do
+        expect(subject.to_tex).to eq('3^X2')
+      end
+    end
+
+    context 'when both variables are numeric' do
+      it 'prints both numbers' do
+        expect(subject.to_tex).to eq('3^2')
+      end
+    end
+
+    context 'when one of the variables is a number' do
+      before do
+        variables[0] = 1
+        subject.exponent.value = nil
+      end
+
+      it 'prints both numbers' do
+        expect(subject.to_tex).to eq('1^X2')
+      end
+    end
+  end
+end
+

data/spec/lib/danica/function_spec.rb

@@ -25,7 +25,11 @@ describe Danica::Function do
       end
 
       def spatial_acceleration
-        Division.new(numerator: Product.new(variables: [ acceleration, time, time ]), denominator: 2)
+        Division.new(numerator: Product.new(variables: [ acceleration, time_squared ]), denominator: 2)
+      end
+
+      def time_squared
+        Power.new(base: time, exponent: 2)
       end
     end
   end
@@ -34,15 +38,15 @@ describe Danica::Function do
     context 'when creating the spatial function for constantly accelerated movement' do
       let(:variables) do
         {
-          time: Danica::Variable.new(name: :t),
-          acceleration: Danica::Variable.new(name: :a),
-          initial_space: Danica::Variable.new(name: :S0, latex: 'S_0'),
-          initial_velocity: Danica::Variable.new(name: :V0, latex: 'V_0')
+          time: :t,
+          acceleration: 'a',
+          initial_space: { name: :S0, latex: 'S_0' },
+          initial_velocity: { name: :V0, latex: 'V_0' }
         }
       end
 
       let(:subject) { described_class::Spatial.new(variables) }
-      let(:expected) { 'S_0 + V_0 \cdot t + \frac{a \cdot t \cdot t}{2}'  }
+      let(:expected) { 'S_0 + V_0 \cdot t + \frac{a \cdot t^2}{2}'  }
 
       it 'return the latex format CAM' do
         expect(subject.to_tex).to eq(expected)

data/spec/support/shared_examples/function.rb

@@ -9,7 +9,7 @@ shared_examples 'a function that knows how to calculate' do |arguments|
   end
   let(:variables) do
     (1..4).map do |i|
-      Danica::Variable.new(name: "X#{i}", value: numeric_variables[i-1])
+      { name: "X#{i}", value: numeric_variables[i-1] }
     end
   end
   let(:numeric_variables){ (1..4).to_a }
@@ -50,9 +50,7 @@ shared_examples 'a function that knows how to write to tex' do |arguments|
 
   describe 'to_tex' do
     let(:variables) do
-      (1..4).map do |i|
-        Danica::Variable.new(name: "X#{i}")
-      end
+      (1..4).map { |i| "X#{i}" }
     end
 
     context 'when variables have no value' do
@@ -65,7 +63,7 @@ shared_examples 'a function that knows how to write to tex' do |arguments|
       let(:numeric_variables_index) { 1 }
       before do
         (0..numeric_variables_index).each do |i|
-          variables[i].value = numeric_variables[i]
+          subject.variables[i].value = numeric_variables[i]
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Darthjee
@@ -140,6 +140,7 @@ files:
 - lib/danica/function.rb
 - lib/danica/function/chained.rb
 - lib/danica/function/division.rb
+- lib/danica/function/power.rb
 - lib/danica/function/product.rb
 - lib/danica/function/sum.rb
 - lib/danica/not_defined.rb
@@ -147,6 +148,7 @@ files:
 - lib/danica/variable.rb
 - lib/danica/version.rb
 - spec/lib/danica/function/division_spec.rb
+- spec/lib/danica/function/power_spec.rb
 - spec/lib/danica/function/product_spec.rb
 - spec/lib/danica/function/sum_spec.rb
 - spec/lib/danica/function_spec.rb
@@ -178,6 +180,7 @@ specification_version: 4
 summary: Danica
 test_files:
 - spec/lib/danica/function/division_spec.rb
+- spec/lib/danica/function/power_spec.rb
 - spec/lib/danica/function/product_spec.rb
 - spec/lib/danica/function/sum_spec.rb
 - spec/lib/danica/function_spec.rb