danica 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819638dac151e3f8b6ebff32f9cbe3d0e5478d79
-  data.tar.gz: 4bc0a877096317ab2e3a85eb481526057c3e5c9c
+  metadata.gz: 429321643b0113576822386a859ccac11543b36f
+  data.tar.gz: 2f34a7c65a4f47429b09a088cf5194a54fe139c1
 SHA512:
-  metadata.gz: f9342e9487fa8c29b7b507f669798acde6a8e5b5884abb096e8286317dc4ae2edf05b7d5113caeec7ac6fc422d04041d994665d86656033efc122c7fa752c9b8
-  data.tar.gz: a5c184b88248538b8b538cfa875f172a6efc41b1145175ddbb696fb013da2d63f1c5952ce8aa3cf7fcd4af3b57b3455408a13966868f5bf8dbeb0742bf8ba88b
+  metadata.gz: 25f35ba1b18ef3ba0df7fcc2d9341524e4b79fbd40e55695bca92e9484ec2bd47eced63740ee3673b1d5364f0feeeb0af8065809de22cad5d1ee4c4ae5fc688a
+  data.tar.gz: 24c2034b52eaaeb1905b9b5b8ab9d938d014eece4d51130404d24bf883a286bfd85f304a2780a4ddf73109e4b07b55c62b62087da50f11a9b19431853ad81de2

data/danica.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 5.1.4'
   spec.add_runtime_dependency 'activemodel', '~> 5.1.4'
-  spec.add_runtime_dependency 'concern_builder', '~> 0.0.3'
   spec.add_runtime_dependency 'darthjee-core_ext', '~> 1.5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/danica.rb

@@ -1,26 +1,27 @@
 require 'active_model'
 
 module Danica
-  autoload :BaseOperations, 'danica/base_operations'
-  autoload :VariablesHolder, 'danica/variables_holder'
-  autoload :Common,        'danica/common'
-  autoload :Number,        'danica/number'
-  autoload :Negative,      'danica/negative'
-  autoload :Group,         'danica/group'
-  autoload :Variable,      'danica/variable'
-  autoload :Operator,      'danica/operator'
-  autoload :Function,      'danica/function'
-  autoload :Exception,     'danica/exception'
-  autoload :Constant,      'danica/constant'
+  autoload :BaseOperations,   'danica/base_operations'
+  autoload :VariablesHolder,  'danica/variables_holder'
+  autoload :Common,           'danica/common'
+  autoload :Number,           'danica/number'
+  autoload :Negative,         'danica/negative'
+  autoload :PositiveNegative, 'danica/positive_negative'
+  autoload :Group,            'danica/group'
+  autoload :Variable,         'danica/variable'
+  autoload :Operator,         'danica/operator'
+  autoload :Function,         'danica/function'
+  autoload :Exception,        'danica/exception'
+  autoload :Constant,         'danica/constant'
 
-  autoload :Product,       'danica/product'
-  autoload :Sum,           'danica/sum'
-  autoload :Division,      'danica/division'
-  autoload :Power,         'danica/power'
-  autoload :SquaredRoot,   'danica/squared_root'
-  autoload :Exponential,   'danica/exponential'
-  autoload :Sin,           'danica/sin'
-  autoload :Cos,           'danica/cos'
+  autoload :Product,          'danica/product'
+  autoload :Sum,              'danica/sum'
+  autoload :Division,         'danica/division'
+  autoload :Power,            'danica/power'
+  autoload :SquaredRoot,      'danica/squared_root'
+  autoload :Exponential,      'danica/exponential'
+  autoload :Sin,              'danica/sin'
+  autoload :Cos,              'danica/cos'
 
   E = Constant.new(Math::E, :e, 'exp(1)')
   PI =  Constant.new(Math::PI, '\pi', :pi)

data/lib/danica/division.rb

@@ -13,7 +13,7 @@ module Danica
     end
 
     def to_gnu
-      "#{numerator.to_gnu}/#{denominator.to_gnu}"
+      "(#{numerator.to_gnu})/(#{denominator.to_gnu})"
     end
   end
 end

data/lib/danica/negative.rb

@@ -1,12 +1,13 @@
 module Danica
   class Negative
     include Common
+    include BaseOperations
     include VariablesHolder
     include ActiveModel::Model
 
     attr_accessor :value
 
-    default_value :priority, 1
+    default_value :priority, 2
     default_value :is_grouped?, false
     
     delegate :valued?, to: :value
@@ -20,11 +21,11 @@ module Danica
     end
 
     def to_tex
-      "-#{value.to_tex}"
+      "-#{wrap_as_group(value).to_tex}"
     end
 
     def to_gnu
-      "-#{value.to_gnu}"
+      "-#{wrap_as_group(value).to_gnu}"
     end
 
     def ==(other)

data/lib/danica/positive_negative.rb

@@ -0,0 +1,37 @@
+module Danica
+  class PositiveNegative
+    include Common
+    include BaseOperations
+    include VariablesHolder
+    include ActiveModel::Model
+
+    attr_accessor :value
+
+    default_value :priority, 2
+    default_value :is_grouped?, false
+    
+    delegate :valued?, to: :value
+
+    def initialize(value)
+      @value = wrap_value(value)
+    end
+
+    def to_f
+      value.to_f
+    end
+
+    def to_tex
+      "\\pm #{wrap_as_group(value).to_tex}"
+    end
+
+    def to_gnu
+      "+ #{wrap_as_group(value).to_gnu}"
+    end
+
+    def ==(other)
+      return false unless other.class == self.class
+      value == other.value
+    end
+  end
+end
+

data/lib/danica/sum.rb

@@ -22,7 +22,7 @@ module Danica
 
     def join_proc(symbol)
       proc do |_, value|
-        value.is_a?(Negative) ? ' ' : " #{symbol} "
+        value.is_a?(Negative) || value.is_a?(PositiveNegative) ? ' ' : " #{symbol} "
       end
     end
   end

data/lib/danica/variables_holder/variables_builder.rb

@@ -1,33 +1,41 @@
-require 'concern_builder'
 require 'darthjee/core_ext'
 
 module Danica::VariablesHolder
-  class VariablesBuilder < ::ConcernBuilder
-    attr_reader :instance
+  class VariablesBuilder
+    attr_reader :instance, :attr_names
+
+    def initialize(attr_names, instance)
+      @instance = instance
+      @attr_names = attr_names
+    end
+
+    def build
+      attr_names.extract_options!.each do |name, default|
+        add_setter(name)
+        add_reader(name, default)
+        instance.variables_names << name
+      end
 
-    def init
       attr_names.each do |name|
         add_setter(name)
-        add_reader(name)
-        instance.send(:variables_names) << name
+        add_reader(name, name)
+        instance.variables_names << name
       end
     end
 
     private
 
     def add_setter(name)
-      code = <<-CODE
-        variables_hash[:#{name}] = wrap_value(value)
+      instance.send(:define_method, "#{name}=") do |value|
+        variables_hash[name.to_sym] = wrap_value(value)
         @variables = variables_hash.values
-      CODE
-      add_method("#{name}=(value)", code)
+      end
     end
 
-    def add_reader(name)
-      code = <<-CODE
-        variables_hash[:#{name}]
-      CODE
-      add_method("#{name}", code)
+    def add_reader(name, default)
+      instance.send(:define_method, name) do
+        variables_hash[name.to_sym] ||= wrap_value(default)
+      end
     end
   end
 end

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.0.6'
+  VERSION = '2.1.0'
 end

data/spec/integration/negative_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'integration of negative' do
+  describe 'with a sum' do
+    subject do
+      Danica::Negative.new(
+        Danica::Sum.new(1,2,3)
+      )
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('-(1 + 2 + 3)')
+      end
+    end
+
+    describe '#to_tex' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('-\left(1 + 2 + 3\right)')
+      end
+    end
+  end
+end
+
+

data/spec/integration/positive_negative_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'integration of positive negative' do
+  describe 'with a sum' do
+    subject do
+      Danica::PositiveNegative.new(
+        Danica::Sum.new(1,2,3)
+      )
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('+ (1 + 2 + 3)')
+      end
+    end
+
+    describe '#to_tex' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('\pm \left(1 + 2 + 3\right)')
+      end
+    end
+  end
+end
+

data/spec/integration/sum_spec.rb

@@ -1,20 +1,26 @@
 require 'spec_helper'
 
 describe 'integration of sum' do
-  describe 'with negative numbers' do
+  describe 'with negative and positivenegative (+/-) numbers' do
     subject do
-      Danica::Sum.new(Danica::Negative.new(1), 2, Danica::Negative.new(3), 4)
+      Danica::Sum.new(
+        Danica::Negative.new(1),
+        2,
+        Danica::Negative.new(3),
+        4,
+        Danica::PositiveNegative.new(5)
+      )
     end
 
     describe '#to_gnu' do
       it 'returns the correct string' do
-        expect(subject.to_gnu).to eq('-1 + 2 -3 + 4')
+        expect(subject.to_gnu).to eq('-1 + 2 -3 + 4 + 5')
       end
     end
 
     describe '#to_tex' do
       it 'returns the correct string' do
-        expect(subject.to_tex).to eq('-1 + 2 -3 + 4')
+        expect(subject.to_tex).to eq('-1 + 2 -3 + 4 \pm 5')
       end
     end
   end

data/spec/lib/danica/division_spec.rb

@@ -16,10 +16,31 @@ describe Danica::Division do
       partial_string_expected: '\frac{2}{X2}'
     },
     to_gnu: {
-      string_expected: 'X1/X2',
-      numeric_string_expected: '2/4',
-      partial_string_expected: '2/X2'
+      string_expected: '(X1)/(X2)',
+      numeric_string_expected: '(2)/(4)',
+      partial_string_expected: '(2)/(X2)'
     }
   }
+
+  describe 'more complex division' do
+    describe 'of two sums' do
+      subject do
+        Danica::Division.new(
+          Danica::Sum.new(2, :x),
+          Danica::Sum.new(3, :y)
+        )
+      end
+
+      describe 'to_gnu' do
+        let(:expected) do
+          '(2 + x)/(3 + y)'
+        end
+
+        it 'groups sum' do
+          expect(subject.to_gnu).to eq(expected)
+        end
+      end
+    end
+  end
 end
 

data/spec/lib/danica/function_spec.rb

@@ -26,7 +26,7 @@ describe Danica::Function do
 
     describe '#to_gnu' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { 'S0 + V0 * t + a * t**(2)/2'  }
+        let(:expected) { 'S0 + V0 * t + (a * t**(2))/(2)'  }
 
         it 'return the latex format CAM' do
           expect(subject.to_gnu).to eq(expected)
@@ -222,7 +222,7 @@ describe Danica::Function do
       {
         x: :x,
         median: :u,
-        variance_root: :v
+        variance_root: { latex: '\theta', gnu: :v }
       }
     end
 
@@ -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{2 \cdot \pi \cdot v^{2}}} \cdot e^{-\frac{\left(x -u\right)^{2}}{2 \cdot v^{2}}}'  }
+        let(:expected) { '\frac{1}{\sqrt{2 \cdot \pi \cdot \theta^{2}}} \cdot e^{-\frac{\left(x -u\right)^{2}}{2 \cdot \theta^{2}}}'  }
 
         it 'return the latex format CAM' do
           expect(subject.to_tex).to eq(expected)
@@ -241,9 +241,52 @@ describe Danica::Function do
 
     describe '#to_gnu' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { '1/sqrt(2 * pi * 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 gnu format CAM' do
+          expect(subject.to_gnu).to eq(expected)
+        end
+      end
+    end
+
+    context 'when not passing variables' do
+      subject { described_class::Gauss.new }
+
+      describe '#to_tex' do
+        let(:expected) { '\frac{1}{\sqrt{2 \cdot \pi \cdot \theta^{2}}} \cdot e^{-\frac{\left(x -u\right)^{2}}{2 \cdot \theta^{2}}}'  }
+
+        it 'rely on default variables definition' do
+          expect(subject.to_tex).to eq(expected)
+        end
+      end
+
+      describe '#to_gnu' do
+        let(:expected) { '(1)/(sqrt(2 * pi * v**(2))) * exp(-((x -u)**(2))/(2 * v**(2)))' }
+
+        it 'rely on default variables definition' do
+          expect(subject.to_gnu).to eq(expected)
+        end
+      end
+    end
+  end
+
+  describe 'baskara' do
+    context 'when using the default value for variables' do
+      subject { described_class::Baskara.new }
+      it_behaves_like 'an object that respond to basic_methods'
+
+      describe '#to_tex' do
+        let(:expected) { '\frac{-b \pm \sqrt{b^{2} -4 \cdot a \cdot c}}{2 \cdot a}'  }
 
         it 'return the latex format CAM' do
+          expect(subject.to_tex).to eq(expected)
+        end
+      end
+
+      describe '#to_gnu' do
+        let(:expected) { '(-b + sqrt(b**(2) -4 * a * c))/(2 * a)'  }
+
+        it 'return the gnu format CAM' do
           expect(subject.to_gnu).to eq(expected)
         end
       end

data/spec/lib/danica/negative_spec.rb

@@ -5,6 +5,7 @@ describe Danica::Negative do
   subject { described_class.new(value) }
 
   it_behaves_like 'an object that respond to basic_methods'
+  it_behaves_like 'an object with basic operation'
 
   describe '#to_f' do
     it 'returns the float of value' do

data/spec/lib/danica/positive_negative_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Danica::PositiveNegative do
+  let(:value) { Danica::Number.new(10) }
+  subject { described_class.new(value) }
+
+  it_behaves_like 'an object that respond to basic_methods'
+  it_behaves_like 'an object with basic operation'
+
+  describe '#to_f' do
+    it 'returns the float of value' do
+      expect(subject.to_f).to eq(10)
+    end
+
+    it { expect(subject.to_f).to be_a(Float) }
+  end
+
+  describe '#to_tex' do
+    context 'when value should be integer' do
+      let(:value) { 10.0 }
+
+      it 'returns the positive negative string' do
+        expect(subject.to_tex).to eq('\pm 10')
+      end
+    end
+
+    context 'when value should be float' do
+      let(:value) { 10.5 }
+
+      it 'returns the positive negative string' do
+        expect(subject.to_tex).to eq('\pm 10.5')
+      end
+    end
+  end
+
+  describe '#to_gnu' do
+    context 'when value should be integer' do
+      let(:value) { 10.0 }
+
+      it 'returns the value integer string' do
+        expect(subject.to_gnu).to eq('+ 10')
+      end
+    end
+
+    context 'when value should be a float' do
+      let(:value) { 10.5 }
+
+      it 'returns the value float string' do
+        expect(subject.to_gnu).to eq('+ 10.5')
+      end
+    end
+  end
+end

data/spec/support/models/functions/baskara.rb

@@ -0,0 +1,25 @@
+module Danica
+  class Function::Baskara < Function
+    variables :a, :b, :c
+    delegate :to_f, :to_tex, :to_gnu, to: :division
+
+    private
+
+    def division
+      numerator / denominator
+    end
+
+    def numerator
+       Negative.new(b) + PositiveNegative.new(SquaredRoot.new(delta))
+    end
+
+    def denominator
+      Number.new(2) * a
+    end
+
+    def delta
+      Power.new(b, 2) - Product.new(4, a, c)
+    end
+  end
+end
+

data/spec/support/models/functions/gauss.rb

@@ -1,6 +1,6 @@
 module Danica
   class Function::Gauss < Function
-    variables :x, :median, :variance_root
+    variables :x, median: :u, variance_root: { latex: '\theta', gnu: :v }
     delegate :to_f, :to_tex, :to_gnu, to: :product
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.4
-- !ruby/object:Gem::Dependency
-  name: concern_builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: darthjee-core_ext
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +166,7 @@ files:
 - lib/danica/number.rb
 - lib/danica/operator.rb
 - lib/danica/operator/chained.rb
+- lib/danica/positive_negative.rb
 - lib/danica/power.rb
 - lib/danica/product.rb
 - lib/danica/sin.rb
@@ -189,6 +176,8 @@ files:
 - lib/danica/variables_holder.rb
 - lib/danica/variables_holder/variables_builder.rb
 - lib/danica/version.rb
+- spec/integration/negative_spec.rb
+- spec/integration/positive_negative_spec.rb
 - spec/integration/power_spec.rb
 - spec/integration/product_spec.rb
 - spec/integration/sum_spec.rb
@@ -199,6 +188,7 @@ files:
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/negative_spec.rb
 - spec/lib/danica/number_spec.rb
+- spec/lib/danica/positive_negative_spec.rb
 - spec/lib/danica/power_spec.rb
 - spec/lib/danica/product_spec.rb
 - spec/lib/danica/sin_spec.rb
@@ -206,6 +196,7 @@ files:
 - spec/lib/danica/sum_spec.rb
 - spec/lib/danica/variable_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/functions/baskara.rb
 - spec/support/models/functions/gauss.rb
 - spec/support/models/functions/spatial.rb
 - spec/support/shared_contexts/common.rb
@@ -239,6 +230,8 @@ signing_key:
 specification_version: 4
 summary: Danica
 test_files:
+- spec/integration/negative_spec.rb
+- spec/integration/positive_negative_spec.rb
 - spec/integration/power_spec.rb
 - spec/integration/product_spec.rb
 - spec/integration/sum_spec.rb
@@ -249,6 +242,7 @@ test_files:
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/negative_spec.rb
 - spec/lib/danica/number_spec.rb
+- spec/lib/danica/positive_negative_spec.rb
 - spec/lib/danica/power_spec.rb
 - spec/lib/danica/product_spec.rb
 - spec/lib/danica/sin_spec.rb
@@ -256,6 +250,7 @@ test_files:
 - spec/lib/danica/sum_spec.rb
 - spec/lib/danica/variable_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/functions/baskara.rb
 - spec/support/models/functions/gauss.rb
 - spec/support/models/functions/spatial.rb
 - spec/support/shared_contexts/common.rb