cassowary-ruby 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTIwMTZhOTBiNjBiOGQ1NzU1NDk1YTc2YjYzZjEyOGQ5N2UxMGFhOA==
+  data.tar.gz: !binary |-
+    ZjVlYjgwNGFiNGM5ZGFiNWExZTVhYzQzZmEwMjM5MDcyMTJhYmM2ZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODY0ZDI4NjhjODk3N2NhZWFlNzE4NDkxMjM5ZTFlNDY0ZjkwMzE3N2Q0YWY5
+    OTcxZWJmZmJlZjc1YmI4MGRkMjMwOTFlN2U3ZWY0Y2I2MDEwZjRlZTg2MDBm
+    NmJkNjI1MzZiYTcxNDUxY2Y2Njg4MTcxNTY5YWU0NTk3ZjQ5ZGE=
+  data.tar.gz: !binary |-
+    NWNjZThlY2Q1YjMxODBkZDFlMDE0ZmU0YzIyMzhhNTExMzJkZWIyOTRiN2Iw
+    MDY4ODA3ZWFiNDE5MTAxN2RmYzc3OTJmOWJjNGIzZmIxZDkyM2Q1ZWUwMjg1
+    MDdmNzMzMjFiNjM1N2YzOGY4YWU2N2M3ZmRkOTJhMzkxY2U5NDU=

data/lib/linear_expression.rb

@@ -37,6 +37,12 @@ module Cassowary
       terms.empty?
     end
 
+    def value
+      terms.keys.inject(constant) do |memo, v|
+        memo + coefficient_for(v) * v.value
+      end
+    end
+
     def each_variable_and_coefficient(&block)
       terms.each_pair(&block)
     end

data/lib/simplex_solver.rb

@@ -165,8 +165,8 @@ module Cassowary
       edit_vars.each_with_index do |v, idx|
         if v == var
           new_edit_constants[idx] = val
+          return self
         end
-        return self
       end
       raise InternalError, "variable not currently being edited"
     end

data/test/test_cassowary.rb

@@ -139,7 +139,7 @@ class CassowaryTests < Test::Unit::TestCase
     assert x.value.cl_approx 15
   end
 
-  def test_edit1
+  def test_edit1var
     x = Variable.new name: 'x', value: 20
     y = Variable.new name: 'y', value: 30
 
@@ -181,4 +181,38 @@ class CassowaryTests < Test::Unit::TestCase
 
     solver.end_edit
   end
+
+  def test_edit2vars
+    x = Variable.new name: 'x', value: 20
+    y = Variable.new name: 'y', value: 30
+    z = Variable.new name: 'z', value: 120
+
+    solver = SimplexSolver.new
+    solver.add_stay x, Strength::WeakStrength
+    solver.add_stay z, Strength::WeakStrength
+    solver.add_constraint z.cn_equal x*2 + y
+    assert x.value.cl_approx 20
+    assert y.value.cl_approx 80
+    assert z.value.cl_approx 120
+
+    solver.add_edit_var x, Strength::StrongStrength
+    solver.add_edit_var y, Strength::StrongStrength
+    solver.begin_edit
+    solver.suggest_value x, 10
+    solver.suggest_value y, 5
+    solver.resolve
+    assert x.value.cl_approx 10
+    assert y.value.cl_approx 5
+    assert z.value.cl_approx 25
+
+    solver.suggest_value x, -10
+    solver.suggest_value y, 15
+    solver.resolve
+    assert x.value.cl_approx -10
+    assert y.value.cl_approx 15
+    assert z.value.cl_approx -5
+    solver.end_edit
+  end
+
+
 end

data/test/test_variables.rb

@@ -30,4 +30,19 @@ class VariablesTests < Test::Unit::TestCase
     x = Cassowary::SlackVariable.new
     assert_equal "<CV#0x" + x.object_id.to_s(16) + ">", x.inspect
   end
+
+  def test_evaluating_linear_expressions
+    x = Cassowary::Variable.new name: 'x', value: 20
+    expr = x / 10
+    assert expr.value == 2
+
+    expr *= 2
+    assert expr.value == 4
+
+    expr += 10
+    assert expr.value == 14
+
+    expr -= 3
+    assert expr.value == 11
+  end
 end

metadata

@@ -1,52 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cassowary-ruby
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Tim Felgentreff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-27 00:00:00 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies: []
+description: ! '## Cassowary
 
-description: |
-  ## Cassowary
   [![Build Status](https://secure.travis-ci.org/timfel/cassowary.png?branch=master)](https://travis-ci.org/timfel/cassowary)
-  
+
+
   Cassowary is an incremental constraint solving toolkit that
+
   efficiently solves systems of linear equalities and
+
   inequalities. Constraints may be either requirements or
+
   preferences. Client code specifies the constraints to be maintained,
+
   and the solver updates the constrained variables to have values that
+
   satisfy the constraints.
-  
+
+
   This is a Ruby port of the Smalltalk version of Cassowary. The
+
   original distribution can be found
+
   [here](http://www.cs.washington.edu/research/constraints/cassowary/).
-  
+
+
   A technical report is included in the original distribution that
+
   describes the algorithm, interface, and implementation of the
+
   Cassowary solver. Additionally, the distribution contains toy sample
+
   applications written in Smalltalk, C++, Java, and Python, and a more
+
   complex example Java applet, the "Constraint Drawing Application".
 
+'
 email: tim@bithug.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - LICENSE
 - lib/linear_expression.rb
@@ -73,39 +77,31 @@ files:
 - test/test_abstract_methods.rb
 - test/test_cassowary.rb
 homepage: https://github.com/timfel/cassowary-ruby
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.a
 signing_key: 
-specification_version: 3
-summary: Cassowary is an incremental constraint solving toolkit that efficiently solves systems of linear equalities and inequalities
-test_files: 
+specification_version: 4
+summary: Cassowary is an incremental constraint solving toolkit that efficiently solves
+  systems of linear equalities and inequalities
+test_files:
 - test/test_helper.rb
 - test/test_variables.rb
 - test/test_ext.rb