lib/danica/common.rb in danica-2.0.3 vs lib/danica/common.rb in danica-2.0.4
- old
+ new
@@ -3,26 +3,14 @@
include BaseOperations
require 'danica/common/class_methods'
require 'danica/common/variables_builder'
attr_accessor :variables
-
+
def to_f
raise 'Not IMplemented yet'
end
-
- def calculate(*args)
- vars_map = args.extract_options!
- vars_map = variables_value_hash.merge(vars_map)
- vars_map.each do |k, v|
- unless v && (v.is_a?(Integer) || v.valued?)
- vars_map[k] = args.shift
- end
- end
-
- self.class.new(vars_map).to_f
- end
def to_tex
Number.new(to_f).to_tex
rescue Exception::NotDefined
tex_string
@@ -72,10 +60,10 @@
def wrap_value(value)
return Number.new(value) if value.is_a?(Numeric)
return Variable.new(value) if value.is_a?(Hash)
return Variable.new(name: value) if [ String, Symbol ].any? { |c| value.is_a?(c) }
- return Variable.new if value == nil
+ return Variable.new if value.nil?
value
end
end
end