pacer-scale 0.1.7-java → 0.1.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2f07ac32f5a70155cc5814a97889394cd8cb32
-  data.tar.gz: f9b7295f26fa30120f7d46646910b4992ae3dea3
+  metadata.gz: ef08c8251a583e97e73a5657b3c6a36d0fa83826
+  data.tar.gz: 19ecd32bebb09528a5c4e512e98c161979477475
 SHA512:
-  metadata.gz: c596e6c5adab4f6fc9781d036dd368c220108f47baae812a0a5780b6480047b734b5fb7af3a0b7e1c409d5af128ab7034a659daa5787b287fb7839af55b19a8f
-  data.tar.gz: b593f845028806e76e521893b54613b2b9dbc4e1c727095fe055007672f32db576f47537b017f3d7b26800a66d8d281a61a51dc1f8b6cec200d01ac1f3ec6fb3
+  metadata.gz: c90ce15d51353f27d333427376a84a6789c8dbf98f0bf7576e45a8887a669cba9f9b52fb2f333bcb75a64eb8d3e0985171fb62d09629562acff2ea3df31c1e90
+  data.tar.gz: b7cfdf0e8b76860fabec6a90258063d48748666cb34fe8d91032dec7c1d357038de31e19e669f82855ec748a2ee53280b8336da2d7417db7e3fc82b3cb28cb9d

data/src/ruby/pacer-scale/version.rb

@@ -1,3 +1,3 @@
 module PacerScale
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/src/ruby/pacer-scale.rb

@@ -81,6 +81,14 @@ module PacerScale
         offset(val - value, 0).first
       end
 
+      def offset_and_multiply(offset_by, mult, tol)
+        _as_scale.offset_and_multiply(offset_by, mult, tol)
+      end
+
+      def multiply_and_offset(mult, offset_by, tol)
+        _as_scale.multiply_and_offset(mult, offset_by, tol)
+      end
+
       def offset(offset_by, tolerance)
         _as_scale.offset(offset_by, tolerance)
       end
@@ -115,7 +123,8 @@ module PacerScale
   end
 
   module RangeTraversal
-    attr_accessor :min, :max, :step, :offset_by, :above_tolerance, :below_tolerance
+    attr_accessor :min, :max, :step, :offset_by, :above_tolerance, :below_tolerance,
+      :multiply_before, :multiply_after
 
     def min=(val)
       @min = val
@@ -129,9 +138,31 @@ module PacerScale
       @step = bigdec(val)
     end
 
+    def offset_and_multiply(offset_by, mult, t_below, t_above = nil)
+      t_above ||= t_below
+      @offset_by = bigdec(offset_by || 0)
+      @multiply_before = bigdec(1)
+      @multiply_after = bigdec(mult || 0)
+      @below_tolerance = bigdec(t_below)
+      @above_tolerance = bigdec(t_above)
+      v.add_extensions(extensions)
+    end
+
+    def multiply_and_offset(mult, offset_by, t_below, t_above = nil)
+      t_above ||= t_below
+      @offset_by = bigdec(offset_by || 0)
+      @multiply_before = bigdec(mult || 0)
+      @multiply_after = bigdec(1)
+      @below_tolerance = bigdec(t_below)
+      @above_tolerance = bigdec(t_above)
+      v.add_extensions(extensions)
+    end
+
     def offset(offset_by, t_below, t_above = nil)
       t_above ||= t_below
       @offset_by = bigdec(offset_by || 0)
+      @multiply_before = bigdec(1)
+      @multiply_after = bigdec(1)
       @below_tolerance = bigdec(t_below)
       @above_tolerance = bigdec(t_above)
       v.add_extensions(extensions)
@@ -139,6 +170,8 @@ module PacerScale
 
     def above(offset_by = 0)
       @offset_by = bigdec(offset_by)
+      @multiply_before = bigdec(1)
+      @multiply_after = bigdec(1)
       @below_tolerance = bigdec(0)
       @above_tolerance = nil
       v.add_extensions(extensions)
@@ -146,6 +179,8 @@ module PacerScale
 
     def below(offset_by = 0)
       @offset_by = bigdec(offset_by)
+      @multiply_before = bigdec(1)
+      @multiply_after = bigdec(1)
       @below_tolerance = nil
       @above_tolerance = bigdec(0)
       v.add_extensions(extensions)
@@ -159,14 +194,18 @@ module PacerScale
 
     def inspect_string
       if above_tolerance == below_tolerance
-        "offset(#{ offset_by }, #{above_tolerance})"
+        "offset(#{ multiply_before }, #{ offset_by }, #{multiply_after}, #{above_tolerance})"
       else
-        "offset(#{ offset_by }, #{below_tolerance.inspect}, #{above_tolerance.inspect})"
+        "offset(#{ multiply_before }, #{ offset_by }, #{multiply_after}, #{below_tolerance.inspect}, #{above_tolerance.inspect})"
       end
     end
 
     def attach_pipe(end_pipe)
-      pipe = ScaleRangePipe.new(min, max, step, (offset_by || bigdec(0)), below_tolerance, above_tolerance)
+      pipe = ScaleRangePipe.new(min, max, step,
+                                (multiply_before || bigdec(1)),
+                                (offset_by || bigdec(0)),
+                                (multiply_after || bigdec(1)),
+                                below_tolerance, above_tolerance)
       pipe.set_starts end_pipe if end_pipe
       pipe
     end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: pacer-scale
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pacer
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pacer
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-its
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec-its
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: builder
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: builder
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: nokogiri
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: xn_gem_release_tasks
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.21
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.21
+  name: xn_gem_release_tasks
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.21
 description: Generate and produce ranges in scale data structures in the graph
 email:
 - dw@xnlogic.com