{"action":"created","issue":{"url":"https://api.github.com/repos/psychopy/psychopy/issues/1030","labels_url":"https://api.github.com/repos/psychopy/psychopy/issues/1030/labels{/name}","comments_url":"https://api.github.com/repos/psychopy/psychopy/issues/1030/comments","events_url":"https://api.github.com/repos/psychopy/psychopy/issues/1030/events","html_url":"https://github.com/psychopy/psychopy/pull/1030","id":118924315,"number":1030,"title":"Improve staircase test coverage, fix QUEST","user":{"login":"hoechenberger","id":2046265,"avatar_url":"https://avatars.githubusercontent.com/u/2046265?v=3","gravatar_id":"","url":"https://api.github.com/users/hoechenberger","html_url":"https://github.com/hoechenberger","followers_url":"https://api.github.com/users/hoechenberger/followers","following_url":"https://api.github.com/users/hoechenberger/following{/other_user}","gists_url":"https://api.github.com/users/hoechenberger/gists{/gist_id}","starred_url":"https://api.github.com/users/hoechenberger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hoechenberger/subscriptions","organizations_url":"https://api.github.com/users/hoechenberger/orgs","repos_url":"https://api.github.com/users/hoechenberger/repos","events_url":"https://api.github.com/users/hoechenberger/events{/privacy}","received_events_url":"https://api.github.com/users/hoechenberger/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":5,"created_at":"2015-11-25T21:08:30Z","updated_at":"2015-11-25T22:37:59Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/psychopy/psychopy/pulls/1030","html_url":"https://github.com/psychopy/psychopy/pull/1030","diff_url":"https://github.com/psychopy/psychopy/pull/1030.diff","patch_url":"https://github.com/psychopy/psychopy/pull/1030.patch"},"body":"QUEST intensity scaling was removed. This is a backward-incompatible change, as it removes the `stepType` keyword argument from `QuestHandler.__init__()`. This closes #1006.\r\n\r\nThis PR increases the test coverage of all except the Psi staircase methods. Particularly, it\r\n* adds a test for log steps in the `StairHandler`,\r\n* adds a test for the `QuestHandler`,\r\n* introduces a base class `_BaseTestStairHandler` that implements a `simulate()` method for simplified testing,\r\n* completely reworks `makeBasicResponseCycles()` to create simulated response cycles of arbitrary lengths,\r\n* adds tests for `MultiStairHandler`,\r\n* fixes a problem in `QuestHandler` that lead to the staircases not 'finishing' when run through the `MultiStairHandler`. (Closes #1015)\r\n\r\nCloses #1007 for the time being.\r\n\r\n*@peircej, I accidentally pulled in upstream/master at one point; I've desperately tried to rebase everything on top of master, and this PR is the result. I don't know why Github says there are merge conflicts. Could you please check and see how serious this is? If it's easy to merge by hand, I would kindly ask you to do so; if not, I'll have to look into this rebase/merge thing again, but it already cost me 2 hours :(*"},"comment":{"url":"https://api.github.com/repos/psychopy/psychopy/issues/comments/159747217","html_url":"https://github.com/psychopy/psychopy/pull/1030#issuecomment-159747217","issue_url":"https://api.github.com/repos/psychopy/psychopy/issues/1030","id":159747217,"user":{"login":"jeremygray","id":382342,"avatar_url":"https://avatars.githubusercontent.com/u/382342?v=3","gravatar_id":"","url":"https://api.github.com/users/jeremygray","html_url":"https://github.com/jeremygray","followers_url":"https://api.github.com/users/jeremygray/followers","following_url":"https://api.github.com/users/jeremygray/following{/other_user}","gists_url":"https://api.github.com/users/jeremygray/gists{/gist_id}","starred_url":"https://api.github.com/users/jeremygray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeremygray/subscriptions","organizations_url":"https://api.github.com/users/jeremygray/orgs","repos_url":"https://api.github.com/users/jeremygray/repos","events_url":"https://api.github.com/users/jeremygray/events{/privacy}","received_events_url":"https://api.github.com/users/jeremygray/received_events","type":"User","site_admin":false},"created_at":"2015-11-25T22:37:59Z","updated_at":"2015-11-25T22:37:59Z","body":"Using a graphical tool to resolve merge conflicts is nice, in my limited experience. I forget how I set it up, and have not done a merge conflict in a while. I'm happy to try to reconstruct and share the steps I took to set that up, if it's useful. "}}