physicist 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ec556fd4d506229e77d77f8d449b1c3d0f54b1
-  data.tar.gz: 0c1a334ccf5cbf505e87606ab54fc484947f4c00
+  metadata.gz: 76440466d9ad32c5399bb29a7968595bba52ef50
+  data.tar.gz: 66230d9062e4fbf8454c9823167a0c0e99e5d5bc
 SHA512:
-  metadata.gz: 1925d82228e4c198913dd95e24a1884ffd3a1454300c1f00b771064054c795a6e667c154adf0326ac5a2eff264485c8078a0c406c85bb81b3e2a798e1bd8ec05
-  data.tar.gz: 4212d6b0ef66e42ca3018960b86949b7da0e6050136c7feb2e818231525819e47f6b5b80e98d46e03712a39053ba74f0577a40ae14b3e362f4dab859f62bd456
+  metadata.gz: db17689f1ffb37c76c579e6a0f0f3ae2f457cc43a9fb92b27b1115a9fa97c830fedc5b16b87db263751ce9d24b21321e80eddd9a44ac21d54e8c4db379e9dda4
+  data.tar.gz: 188d057238537f28f5d384d028b68b9f13bb498e4a791564a2ea33d7204a6d7039be21d71e13aa48a9d9e3c34e7b9b797507307ef60960ca43ffa4d7ca000001

data/lib/physicist/body.rb

@@ -25,6 +25,11 @@ module Physicist
       10.0
     end
 
+    # some tiny number
+    def epsilon
+      0.000001
+    end
+
     def at(t, obstacles:[])
       x0, _   = *position
       vx0,vy0 = *velocity
@@ -57,8 +62,8 @@ module Physicist
         end
       end
 
-      vxt = 0 if -0.05 < vx && vx < 0.05
-      vyt = 0 if -0.05 < vy && vy < 0.05
+      vxt = 0 if -epsilon < vx && vx < epsilon
+      vyt = 0 if -epsilon < vy && vy < epsilon
 
       Body.new(
         position: [xt,yt],
@@ -80,9 +85,9 @@ module Physicist
 
         distance_to_next_x_obstacle =
           if vx > 0
-            ((x0+width) - ox).abs
+            ((x0+3*(width/4.0)) - ox).abs
           elsif vx < 0
-            ((x0) - (ox+ow)).abs
+            ((x0+(width/4.0)) - (ox+ow)).abs
           end
 
         distance_travelled_in_x_axis_if_no_obstacles = vx * dt
@@ -91,9 +96,9 @@ module Physicist
           yield [x0 + (vx*dt), vx]
         else
           if vx > 0
-            yield [next_x_obstacle.position[0]-width, 0]
+            yield [next_x_obstacle.position[0]-3*(width/4.0)-epsilon, 0]
           else
-            yield [next_x_obstacle.position[0]+next_x_obstacle.dimensions[0], 0]
+            yield [next_x_obstacle.position[0]+next_x_obstacle.dimensions[0]-(width/4.0)+epsilon, 0]
           end
         end
       else
@@ -120,9 +125,9 @@ module Physicist
           yield [y0 + (vy * dt), vy ]
         else
           if vy > 0
-            yield [next_y_obstacle.position[1] - (height) - 0.001, 0]
-          else 
-            yield [next_y_obstacle.position[1] + next_y_obstacle.dimensions[1] + 0.1, 0]
+            yield [next_y_obstacle.position[1] - (height) - epsilon, 0]
+          else
+            yield [next_y_obstacle.position[1] + next_y_obstacle.dimensions[1] + epsilon, 0]
           end
         end
       else
@@ -133,11 +138,16 @@ module Physicist
     def next_obstacle_on_x_axis(y,vx,t,obstacles:)
       x0,_ = *position
 
+      # w = width/2.0
+      # x0 += w/2.0
+      w = width/2.0
+      x0 += w/2.0
+
       obstacles_along_axis = obstacles.select do |obstacle|
         _,oy = *obstacle.position
         _,oh = *obstacle.dimensions
 
-        oy <= y + height && y <= oy + oh
+        oy <= y + height && y <= oy + oh - (2*epsilon)
       end
 
       obstacles_in_direction_of_movement =
@@ -146,7 +156,7 @@ module Physicist
             ox,_ = *obstacle.position
             # ow,oh = *obstacle.dimensions
 
-            ox >= x0 + width
+            ox >= x0 + w #/2.0)
           end
         elsif vx < 0
           # require 'pry'
@@ -174,8 +184,8 @@ module Physicist
     def next_obstacle_on_y_axis(vy,t,obstacles:)
       x0,y0 = *position
 
-      # x0 += width/4
-      w = width #/2
+      w = width/2.0
+      x0 += w/2.0
 
       obstacles_along_axis = obstacles.select do |obstacle|
         ox,_ = *obstacle.position
@@ -188,14 +198,14 @@ module Physicist
           obstacles_along_axis.select do |obstacle|
             _,oy = *obstacle.position
 
-            oy >= y0 + height
+            oy >= y0 + height - epsilon
           end
         elsif vy < 0
           obstacles_along_axis.select do |obstacle|
             _,oy = *obstacle.position
             _,oh = *obstacle.dimensions
 
-            oy + oh <= y0
+            oy + oh <= y0 + epsilon
           end
         else
           []

data/lib/physicist/laboratory/handlers/create_scientist_handler.rb

@@ -4,15 +4,15 @@ module Physicist
       def handle(scientist_id:, name:, title:, position:, velocity:)
         map_data = (
           [
-            [ 1, 1,   1,   1,   1,   1,   1,   1,   1,   1,   1 ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
-            [ 1, nil, nil, nil, nil, 2, nil, nil, nil, nil, 1 ],
-            [ 1, 1,   1,   1,   1,   1,   1,   1,   1,   1,   1 ]
+            [ 1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1 ],
+            [ nil, nil, nil, nil, nil, 1,   1,   nil, nil, nil, nil, 2,   1 ],
+            [ nil, nil, nil, nil, nil, 1,   1,   nil, nil, nil, nil, nil, 1 ],
+            [ nil, nil, nil, nil, nil, 1,   1,   nil, nil, nil, nil, nil, 1 ],
+            [ nil, nil, nil, nil, nil, 1,   1,   nil, nil, nil, nil, nil, 1 ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 1 ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 3,   1 ],
+            [ 1,   1,   nil, nil, 1,   1,   1,   1,   nil, nil, nil, 2,   1 ],
+            [ 1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1]
           ]
         )
 

data/lib/physicist/laboratory/models/scientist.rb

@@ -26,7 +26,7 @@ module Physicist
       end
 
       def leg_strength # ??
-        -12
+        -15
       end
 
       def max_jump_velocity
@@ -60,7 +60,7 @@ module Physicist
       end
 
       def current
-        @body = body.at(Time.now, obstacles: space.obstacles)
+        body.at(Time.now, obstacles: space.obstacles)
       end
 
       def body

data/lib/physicist/laboratory/views/scientist_view.rb

@@ -13,10 +13,6 @@ module Physicist
         @body = body.at(Time.now, obstacles: workspace_view.obstacles)
       end
 
-      def workspace_view
-        WorkspaceView.find_by(space_id: space_id)
-      end
-
       def body
         # ... integrate physicist bodies ...
         @body ||= construct_body
@@ -30,6 +26,10 @@ module Physicist
           dimensions: [2,2]
         )
       end
+
+      def workspace_view
+        WorkspaceView.find_by(space_id: space_id)
+      end
     end
 
     class NullScientistView

data/lib/physicist/version.rb

@@ -1,4 +1,4 @@
 module Physicist
   # physicist version
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/physicist_spec.rb

@@ -96,7 +96,7 @@ describe Body do
             _,vy = *body_at_t.velocity
             _,y = *body_at_t.position
             expect(vy).to eq(0)
-            expect(y0 - 0.001).to eq(y)
+            expect(y0 - body.epsilon).to eq(y)
           end
         end
 
@@ -113,7 +113,7 @@ describe Body do
           it 'should stop vertical movement after 1s' do
             _,vy = *body_at_t.velocity
             _,y = *body_at_t.position
-            expect(y0 + 9.799).to eq(y)
+            expect(y0 + 9.8 - body.epsilon).to eq(y)
             expect(vy).to eq(0)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: physicist
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Weissman