Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
049eb0e
Allow local deployments
psieg Apr 28, 2015
5dec66e
Update README for our team setup
psieg Apr 28, 2015
840cef6
simplified setup
psieg Apr 28, 2015
7aed2b4
Merge branch 'dev' of https://github.com/psieg/babelsberg-js into dev
Apr 28, 2015
81d107e
improve readme
Apr 28, 2015
eb0dc87
added html to mess around with webworkers
Apr 28, 2015
b554f60
change to fix
psieg May 5, 2015
9be8cfc
tf
psieg May 5, 2015
e9d9760
Merge branch 'dev' of https://github.com/psieg/babelsberg-js into dev
psieg May 5, 2015
f90005c
W.t.f. git
psieg May 5, 2015
2667b8f
changed some to each, added timekeeping to enable and suggestvalue
May 19, 2015
cf38162
Relax: don't solve on always, solve when enabled
psieg May 26, 2015
f763a48
Read correct values while trying out different solvers
psieg May 26, 2015
c2eab94
Disable constraints after testing
psieg May 26, 2015
be72db3
choose the fastest solver
psieg May 26, 2015
22d58d7
Use performance.now() rather than new Date() for performance measures
psieg May 26, 2015
dac6baa
enable the chosen constraint
psieg May 26, 2015
6d92551
only consider enabled solvers as definingSolvers
psieg May 26, 2015
f9fa9eb
reset constraint.current
psieg Jun 2, 2015
7d0f9e0
Merge branch 'some_to_each' into dev
psieg Jun 2, 2015
d8d67e3
trigger travis
psieg Jun 2, 2015
5970d64
Update travis banner
psieg Jun 2, 2015
315b5ae
properly honor opts.postponeEnabling
psieg Jun 2, 2015
e322c24
Merge branch 'dev' of https://github.com/psieg/babelsberg-js into dev
psieg Jun 2, 2015
18c9ae6
use original behaviour for no available solvers, remove hungarian not…
psieg Jun 2, 2015
dab71bc
Do not choose if there is only one solver available
psieg Jun 2, 2015
313cb84
Filter solvers by capabilities before comparing
psieg Jun 2, 2015
3ac19b7
added number of changed variables to constraint selection #15,
Jun 7, 2015
0851995
ResetIsSolveable on enable and bump down when bumped up only
psieg Jun 9, 2015
5f5f12d
Print solverName instead of multiple lines
psieg Jun 9, 2015
8c98e4a
Throw an Error instead of a string
psieg Jun 9, 2015
92f7927
Remove recursion guard after recursive call
psieg Jun 9, 2015
347de64
Enable constraint before using it
psieg Jun 9, 2015
0ac16ea
Use __solver__ instead of solver so DBPlanner works too
psieg Jun 9, 2015
6d29035
Hack to get some legacy tests green (fixme)
psieg Jun 9, 2015
f1359f2
Fix tests by undoing fix for garbage code
psieg Jun 10, 2015
c27bad9
Remove hardcoded debugger statements in test flow
psieg Jun 10, 2015
1fd4a77
fixed selecting a constraint when there is none left
Jun 10, 2015
649c061
added try catch to single solver constraint
Jun 10, 2015
d1900f5
If not enabled, return stored value
psieg Jun 16, 2015
824fcf8
single solver: do not enable if opts.postponeEnabling
psieg Jun 16, 2015
75e9dbe
refactor always for postponeEnabling
psieg Jun 16, 2015
40796dc
travis test: use console.time instead of performance.now
psieg Jun 16, 2015
2860684
style
psieg Jun 16, 2015
3596183
add a test for automatic solver selection, put Cassowary as default
j4yk Jun 22, 2015
93e89b1
Revert 40796dc: travis test: use console.time instead of performance.now
j4yk Jun 22, 2015
ce5e8d1
add a test for automatic selection of DeltaBlue
j4yk Jun 22, 2015
cf4c779
Tests: Fall back to Date if performance is undefined
psieg Jun 23, 2015
414fe6c
Merge branch 'capabilities' of https://github.com/psieg/babelsberg-js…
psieg Jun 23, 2015
1cfc558
style
psieg Jun 23, 2015
d24a56f
try to fix lively tests
Jun 23, 2015
a7e06b7
handle cases where definingSolver is null better
psieg Jun 23, 2015
23a228b
Merge branch 'capabilities' of https://github.com/psieg/babelsberg-js…
psieg Jun 23, 2015
3f1269e
style
psieg Jun 23, 2015
5a1feab
try lively tests again
Jun 23, 2015
9cd04db
format the requirements of tests.js
j4yk Jun 22, 2015
8446860
include csp in defaultSolvers
j4yk Jun 23, 2015
12d31aa
try resetting the global state of the tests in a setUp method
j4yk Jun 29, 2015
8373bb3
this should get the lively tests green
psieg Jun 30, 2015
c6815d3
Merge branch 'capabilities' of https://github.com/psieg/babelsberg-js…
psieg Jun 30, 2015
d96ad86
Merge pull request #17 from psieg/capabilities
Jun 30, 2015
a5b0b27
consolidate defaultSolvers setUp in tests
j4yk Jun 30, 2015
aa12669
Merge remote-tracking branch 'origin/dev' into solver-selection-tests
j4yk Jun 30, 2015
fd15fff
Merge pull request #21 from psieg/solver-selection-tests
psieg Jun 30, 2015
c9ae166
Add logging flags to constraint options
psieg Jun 30, 2015
14e9720
Merge remote-tracking branch 'origin/dev' into 15_variable_count
j4yk Jun 30, 2015
07a85d2
guard clause in chooseConstraint
j4yk Jun 30, 2015
431d0e6
rename chooseConstraint to chooseConstraintBasedOnMetrics
j4yk Jun 30, 2015
bd4b528
Pass logTimings flag to Constraint and ConstraintVariable
psieg Jun 30, 2015
7c74e26
fix nBegin vs. begin typo
j4yk Jun 30, 2015
858363b
style
psieg Jun 30, 2015
58e3908
do not try to disable constraint which have just been nulled
j4yk Jun 30, 2015
4153ac6
record variable changes with oldValue and newValue during #enable
j4yk Jun 30, 2015
4456447
add a method to compute the squared distance from variable assignments
j4yk Jun 30, 2015
fac1650
add a test for the squaredChangeDistance computation
j4yk Jun 30, 2015
9600dca
Merge pull request #22 from psieg/logging_opts
j4yk Jul 5, 2015
a07fd18
style
j4yk Jul 5, 2015
67b4bc4
allow to choose the metrics which determine the best solver
j4yk Jul 5, 2015
1eba646
added "numberOfChangedVariables" to optimizationPriority
Jul 7, 2015
c24a157
fix incomplete for-loop condition
j4yk Jul 7, 2015
6002f16
restore defaultSolvers after our tests
j4yk Jul 7, 2015
329b7cd
fix handling of strings in the squared change distance
j4yk Jul 7, 2015
144ef8d
restore defaultSolvers after our tests
j4yk Jul 7, 2015
3a1c6f9
whitespace
j4yk Jul 9, 2015
43e5252
have Constraints know their options and introduce definingConstraint
j4yk Jul 9, 2015
2311d2f
do not enable Z3 immediately in solver.always
j4yk Jul 11, 2015
2e02c6b
split some parts Babelsberg.always into smaller methods
j4yk Jul 11, 2015
77405b3
move Babelsberg.chooseSolvers and .filterSolvers up to match invocations
j4yk Jul 11, 2015
5538a5b
choose solvers again after 1000 initial suggests by default
j4yk Jul 11, 2015
b4aa37f
add assertion that the later unselected solver is not called anymore
j4yk Jul 11, 2015
d795974
rename _searchDefinginSolver to _searchDefiningSolverAndConstraint
j4yk Jul 11, 2015
cf06d86
only consider enabled Constraints for ConstrVar._hasMultipleSolvers
j4yk Jul 11, 2015
ec136ee
remove old console.log about the busy wait for the stubbed test solvers
j4yk Jul 11, 2015
f614e90
do not use Set because it is too new for the node on travis
j4yk Jul 11, 2015
eda6318
tabs to spaces
j4yk Jul 11, 2015
311343b
fix too long lines
j4yk Jul 11, 2015
f04e656
eject unused external variables from ConstrainedVariables
j4yk Jul 11, 2015
0b92c14
fix: Constraint.updateCounter increased too often
j4yk Jul 11, 2015
3ee5fbc
Isolate test.html inline js
psieg Jul 7, 2015
e550316
Add supportedDataTypes to solvers
psieg Jul 11, 2015
9d879f4
Pass func to filterSolvers, test supportedDataTypes
psieg Jul 11, 2015
ecbdccb
Add ConstraintInspectionLayer
psieg Jul 11, 2015
57778e4
Collect types used for filtering
psieg Jul 11, 2015
b1be95e
Do not use unsupported sets
psieg Jul 11, 2015
644b402
Add funcMapping magic
psieg Jul 11, 2015
2665b91
Filter by gathered data types
psieg Jul 11, 2015
8fcf7e2
Add tests
psieg Jul 12, 2015
fe8e9fa
Fix testcase variable visibility
psieg Jul 12, 2015
6f19064
fix deletion scope
psieg Jul 12, 2015
00b055b
changes according to PR remarks, changed indentation in tests.js to s…
Jul 13, 2015
fde8011
Merge branch 'master' into dev
psieg Jul 14, 2015
470f060
Don't try to outsmart the disabling mechanism
psieg Jul 14, 2015
6b08016
remove unused parameter
psieg Jul 14, 2015
35f6fea
Fix tests and detection, add object as type
psieg Jul 14, 2015
46acc9d
Merge branch 'dev' into parse_filter_4
psieg Jul 14, 2015
bedd7a4
Properly filter through function calls
psieg Jul 14, 2015
452d232
Add filtering by finite domain support
psieg Jul 15, 2015
c6ea9b4
tests for squaredChangeDistance
Jul 15, 2015
e9d2f18
fix testnames
Jul 15, 2015
93990e3
merge dev
Jul 15, 2015
af30812
damn linter
Jul 15, 2015
585b3d0
Merge dev
Jul 18, 2015
d92e2f9
remove hungarian notation
Jul 18, 2015
fcebc6e
uncommented lines in searchDefiningSolver
Jul 18, 2015
fbe1618
Merge pull request #24 from psieg/feature/13_squared_change_distance
Jul 18, 2015
2a11600
Merge dev
Jul 18, 2015
761d7ca
remove commented line
Jul 18, 2015
070b5e6
Add comment to cassowary capabilites
psieg Jul 19, 2015
7d11b30
remove bug notice from test case
j4yk Jul 20, 2015
3f77e17
reset the _definingSolver to null when the Constraint solver changes
j4yk Jul 20, 2015
91c3687
Merge pull request #25 from psieg/feature/reevaluation
j4yk Jul 20, 2015
987af0e
merge dev into parse_filter_4
Jul 20, 2015
3ca37c7
Merge pull request #26 from psieg/parse_filter_4
Jul 20, 2015
4652d39
Remove undefined from log messsage
psieg Jul 20, 2015
ce173fb
Merge branch 'dev' of https://github.com/psieg/babelsberg-js into dev
psieg Jul 20, 2015
c381809
fix variable name
Jul 20, 2015
108698b
Add logTimings to a test
psieg Jul 21, 2015
0141c84
fix a merge error: filterSolvers takes func as third arg
j4yk Jul 23, 2015
e7bb710
refactor Constraint abandoning
j4yk Jul 23, 2015
a6914e0
Merge pull request #33 from psieg/feature/32-refactoring
psieg Jul 25, 2015
616f906
rename recalculation-attributes to reevaluation for consistency
j4yk Jul 26, 2015
89b7d26
allow to specify the reevaluationInterval in the opts
j4yk Jul 26, 2015
924462d
make sure opts.reevaluationInterval is a number before applying it
j4yk Jul 26, 2015
74a5b93
fix: missed an instance of 'recalculation' (vs reevaluation)
j4yk Jul 26, 2015
e33feb2
eliminate duplicate definition of preparePatchedSolvers in tests
j4yk Jul 26, 2015
bb67349
fix: if a Constraint failed during chooseConstraint is was not abandoned
j4yk Jul 26, 2015
8bbc263
Revert "Update travis banner"
j4yk Jul 26, 2015
7cdc322
Revert "added html to mess around with webworkers"
j4yk Jul 26, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,17 @@ For more information, please visit our [gh-pages](http://babelsberg.github.io/ba
This work is licensed under [3-clause BSD](https://github.com/babelsberg/babelsberg-js/blob/master/LICENSE)

Created under a grant from Hasso Plattner Institute <img src="http://upload.wikimedia.org/wikipedia/de/c/c9/Hpi_logo.png" alt="HPI Logo" width="50" height="50"/>



Setup for our dev team (Windows)
=============
* checkout this repository to ./babelsberg-js
* download "the windows-2015-04-03 release zip." from https://github.com/LivelyKernel/LivelyKernel
* unzip, open CMD, run ```start-lively-server.cmd```
* after it installs packages, you have a working lively kernel at http://localhost:9001
* navigate to LivelyKernel, this is now your root directory for lively
* in LivelyKernel create users/
* rename babelsberg-js to users/timfelgentreff
* copy ohshima to users
* open http://localhost:9001/users/timfelgentreff/babelsberg-js.html
9 changes: 9 additions & 0 deletions babelsberg/cassowary_ext.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ ClSimplexSolver.addMethods({
var constraint = new Constraint(func, this);
constraint.priority = priority;
return constraint;
},
solverName: 'Cassowary',
supportsMethods: function() { return false; },
supportsSoftConstraints: function() { return true; },
supportsFiniteDomains: function() { return false; },
supportedDataTypes: function() {
// Cassowary does not support strings, but there are actively used scenarios
// where js-coercion from string to float is used - these cases would be blown
return ['number', 'string']; /* XXX: is this correct? */
}
});

Expand Down
Loading