Skip to content

Commit

Permalink
wrapped up cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
etosch committed Jun 1, 2015
1 parent b93cf95 commit d82564a
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 120 deletions.
50 changes: 26 additions & 24 deletions surveyman/examples/BackwardsBranching.py
Original file line number Diff line number Diff line change
@@ -1,58 +1,60 @@
#example of invalid branching
#based on https://github.com/etosch/SurveyMan/blob/master/data/tests/test4_two_branches_one_block.csv
from surveyman.survey.surveys import *
from surveyman.survey.blocks import *
from surveyman.survey.constraints import *
import surveyman.survey.surveys as surveys
import surveyman.survey.blocks as blocks
import surveyman.survey.constraints as constraints
import surveyman.survey.questions as questions
import surveyman.survey.options as options


def create_survey():

oneof = "oneof"

q1 = Question(oneof, "Question 1", [Option("foo"), Option("bar"), Option("baz")])
q2 = Question(oneof, "Question 2", [Option("boo"), Option("far"), Option("faz")])
q3 = Question(oneof, "Question 3", [Option("eggs"), Option("ham")])
q1 = questions.Question(oneof, "Question 1", [options.Option("foo"), options.Option("bar"), options.Option("baz")])
q2 = questions.Question(oneof, "Question 2", [options.Option("boo"), options.Option("far"), options.Option("faz")])
q3 = questions.Question(oneof, "Question 3", [options.Option("eggs"), options.Option("ham")])

block1 = Block([q1, q2, q3])
block1 = blocks.Block([q1, q2, q3])

q4 = Question(oneof, "Question 4", [Option("oscar"), Option("lucille"), Option("george")])
q5 = Question(oneof, "Question 5", [Option("maeby"), Option("george")])
q6 = Question(oneof, "Question 6", [Option("gob"), Option("lindsay")])
q7 = Question(oneof, "Question 7", [Option("anne veal"), Option("gene parmesean")])
q4 = questions.Question(oneof, "Question 4", [options.Option("oscar"), options.Option("lucille"), options.Option("george")])
q5 = questions.Question(oneof, "Question 5", [options.Option("maeby"), options.Option("george")])
q6 = questions.Question(oneof, "Question 6", [options.Option("gob"), options.Option("lindsay")])
q7 = questions.Question(oneof, "Question 7", [options.Option("anne veal"), options.Option("gene parmesean")])

block2 = Block([q4, q5, q6, q7])
block2 = blocks.Block([q4, q5, q6, q7])

#didn't add all options
q8 = Question(oneof, "Question 8", [Option("lupe"), Option("marky mark"), Option("tony wonder")])
q9 = Question(oneof, "Question 9", [Option("whooopsie"), Option("daisy")])
q8 = questions.Question(oneof, "Question 8", [options.Option("lupe"), options.Option("marky mark"), options.Option("tony wonder")])
q9 = questions.Question(oneof, "Question 9", [options.Option("whooopsie"), options.Option("daisy")])

block3 = Block([q8, q9])
block3 = blocks.Block([q8, q9])

q10 = Question(oneof, "Her?", [])
q10 = questions.Question(oneof, "Her?", [])

block4 = Block([q10])
block4 = blocks.Block([q10])

q11 = Question(oneof, "Would you mind telling us how this survey made you feel?", [])
q11 = questions.Question(oneof, "Would you mind telling us how this survey made you feel?", [])

block5 = Block([q11])
block5 = blocks.Block([q11])

q12 = Question(oneof, "Did someone say wonder?", [])
q12 = questions.Question(oneof, "Did someone say wonder?", [])

block6 = Block([q12])
block6 = blocks.Block([q12])

branch1 = Constraint(q3)
branch1 = constraints.Constraint(q3)
branch1.add_branch_by_op_text("eggs", block2)
branch1.add_branch_by_op_text("ham", block3)

#branch backwards
branch2 = Constraint(q7)
branch2 = constraints.Constraint(q7)
branch2.add_branch_by_index(0, block1)
branch2.add_branch_by_index(1, block1)


block_list = [block1, block2, block3, block4, block5, block6]
branch_list = [branch1, branch2]

survey = Survey(block_list, branch_list)
survey = surveys.Survey(block_list, branch_list)

return survey
26 changes: 14 additions & 12 deletions surveyman/examples/BranchToSubblock.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
from surveyman.survey.surveys import *
from surveyman.survey.blocks import *
from surveyman.survey.constraints import *
import surveyman.survey.surveys as surveys
import surveyman.survey.blocks as blocks
import surveyman.survey.constraints as constraints
import surveyman.survey.questions as questions
import surveyman.survey.options as options


def create_survey():

oneof = "oneof"

q1 = Question(oneof, "Question 1", [Option(str(x)) for x in range(1, 4)])
q2 = Question(oneof, "Question 2", [Option(str(x)) for x in range(1, 4)])
q3 = Question(oneof, "Question 3", [Option(str(x)) for x in range(1, 4)])
q1 = questions.Question(oneof, "Question 1", [options.Option(str(x)) for x in range(1, 4)])
q2 = questions.Question(oneof, "Question 2", [options.Option(str(x)) for x in range(1, 4)])
q3 = questions.Question(oneof, "Question 3", [options.Option(str(x)) for x in range(1, 4)])

b1 = Block([q1, q2])
b2 = Block([q3])
b4 = Block([Question(oneof, "Question 4", [])])
b1 = blocks.Block([q1, q2])
b2 = blocks.Block([q3])
b4 = blocks.Block([questions.Question(oneof, "Question 4", [])])

b3 = Block([b1, b2])
b3 = blocks.Block([b1, b2])

branch = Constraint(q3)
branch = constraints.Constraint(q3)
#not a top level block
branch.add_branch_by_index(0, b1)
branch.add_branch_by_index(1, b1)
branch.add_branch_by_index(2, b1)

survey = Survey([b3, b4], [branch])
survey = surveys.Survey([b3, b4], [branch])
return survey
54 changes: 28 additions & 26 deletions surveyman/examples/TwoBranchesOneBlock.py
Original file line number Diff line number Diff line change
@@ -1,66 +1,68 @@
#example of invalid branching
#based on https://github.com/etosch/SurveyMan/blob/master/data/tests/test4_two_branches_one_block.csv
from surveyman.survey.surveys import *
from surveyman.survey.blocks import *
from surveyman.survey.constraints import *
import surveyman.survey.surveys as surveys
import surveyman.survey.blocks as blocks
import surveyman.survey.constraints as constraints
import surveyman.survey.questions as questions
import surveyman.survey.options as options


def create_survey():

oneof = "oneof"

q1 = Question(oneof, "Question 1", [Option("foo"), Option("bar"), Option("baz")])
q2 = Question(oneof, "Question 2", [Option("boo"), Option("far"), Option("faz")])
q3 = Question(oneof, "Question 3", [Option("eggs"), Option("ham")])
q1 = questions.Question(oneof, "Question 1", [options.Option("foo"), options.Option("bar"), options.Option("baz")])
q2 = questions.Question(oneof, "Question 2", [options.Option("boo"), options.Option("far"), options.Option("faz")])
q3 = questions.Question(oneof, "Question 3", [options.Option("eggs"), options.Option("ham")])

block1 = Block([q1, q2, q3])
block1 = blocks.Block([q1, q2, q3])

q4 = Question(oneof, "Question 4", [Option("oscar"), Option("lucille"), Option("george")])
q5 = Question(oneof, "Question 5", [Option("maeby"), Option("george")])
q6 = Question(oneof, "Question 6", [Option("gob"), Option("lindsay")])
q7 = Question(oneof, "Question 7", [Option("anne veal"), Option("gene parmesean")])
q4 = questions.Question(oneof, "Question 4", [options.Option("oscar"), options.Option("lucille"), options.Option("george")])
q5 = questions.Question(oneof, "Question 5", [options.Option("maeby"), options.Option("george")])
q6 = questions.Question(oneof, "Question 6", [options.Option("gob"), options.Option("lindsay")])
q7 = questions.Question(oneof, "Question 7", [options.Option("anne veal"), options.Option("gene parmesean")])

block2 = Block([q4, q5, q6, q7])
block2 = blocks.Block([q4, q5, q6, q7])

#didn't add all options
q8 = Question(oneof, "Question 8", [Option("lupe"), Option("marky mark"), Option("tony wonder")])
q9 = Question(oneof, "Question 9", [Option("whooopsie"), Option("daisy")])
q8 = questions.Question(oneof, "Question 8", [options.Option("lupe"), options.Option("marky mark"), options.Option("tony wonder")])
q9 = questions.Question(oneof, "Question 9", [options.Option("whooopsie"), options.Option("daisy")])

block3 = Block([q8, q9])
block3 = blocks.Block([q8, q9])

q10 = Question(oneof, "Her?", [])
q10 = questions.Question(oneof, "Her?", [])

block4 = Block([q10])
block4 = blocks.Block([q10])

q11 = Question(oneof, "Would you mind telling us how this survey made you feel?", [])
q11 = questions.Question(oneof, "Would you mind telling us how this survey made you feel?", [])

block5 = Block([q11])
block5 = blocks.Block([q11])

q12 = Question(oneof, "Did someone say wonder?", [])
q12 = questions.Question(oneof, "Did someone say wonder?", [])

block6 = Block([q12])
block6 = blocks.Block([q12])

branch1 = Constraint(q3)
branch1 = constraints.Constraint(q3)
branch1.add_branch_by_op_text("eggs", block2)
branch1.add_branch_by_op_text("ham", block3)

branch2 = Constraint(q7)
branch2 = constraints.Constraint(q7)
branch2.add_branch_by_index(0, block4)
branch2.add_branch_by_index(1, block3)

#improper branch - more than one branch question in Block 3, doesn't satisfy branch-all
branch3 = Constraint(q8)
branch3 = constraints.Constraint(q8)
branch3.add_branch_by_op_text("lupe", block5)
branch3.add_branch_by_op_text("marky mark", block5)
branch3.add_branch_by_op_text("tony wonder", block6)

branch4 = Constraint(q9)
branch4 = constraints.Constraint(q9)
branch4.add_branch_by_index(0, block4)
branch4.add_branch_by_index(1, block5)

block_list = [block1, block2, block3, block4, block5, block6]
branch_list = [branch1, branch2, branch3, branch4]

survey = Survey(block_list, branch_list)
survey = surveys.Survey(block_list, branch_list)

return survey
50 changes: 26 additions & 24 deletions surveyman/examples/TwoBranchesOneBlock2.py
Original file line number Diff line number Diff line change
@@ -1,58 +1,60 @@
#example of invalid branching
#based on https://github.com/etosch/SurveyMan/blob/master/data/tests/test4_two_branches_one_block.csv
from surveyman.survey.surveys import *
from surveyman.survey.blocks import *
from surveyman.survey.constraints import *
import surveyman.survey.surveys as surveys
import surveyman.survey.blocks as blocks
import surveyman.survey.constraints as constraints
import surveyman.survey.questions as questions
import surveyman.survey.options as options


def create_survey():

oneof = "oneof"

q1 = Question(oneof, "Question 1", [Option("foo"), Option("bar"), Option("baz")])
q2 = Question(oneof, "Question 2", [Option("boo"), Option("far"), Option("faz")])
q3 = Question(oneof, "Question 3", [Option("eggs"), Option("ham")])
q1 = questions.Question(oneof, "Question 1", [options.Option("foo"), options.Option("bar"), options.Option("baz")])
q2 = questions.Question(oneof, "Question 2", [options.Option("boo"), options.Option("far"), options.Option("faz")])
q3 = questions.Question(oneof, "Question 3", [options.Option("eggs"), options.Option("ham")])

block1 = Block([q1, q2, q3])
block1 = blocks.Block([q1, q2, q3])

q4 = Question(oneof, "Question 4", [Option("oscar"), Option("lucille"), Option("george")])
q5 = Question(oneof, "Question 5", [Option("maeby"), Option("george")])
q6 = Question(oneof, "Question 6", [Option("gob"), Option("lindsay")])
q7 = Question(oneof, "Question 7", [Option("anne veal"), Option("gene parmesean")])
q4 = questions.Question(oneof, "Question 4", [options.Option("oscar"), options.Option("lucille"), options.Option("george")])
q5 = questions.Question(oneof, "Question 5", [options.Option("maeby"), options.Option("george")])
q6 = questions.Question(oneof, "Question 6", [options.Option("gob"), options.Option("lindsay")])
q7 = questions.Question(oneof, "Question 7", [options.Option("anne veal"), options.Option("gene parmesean")])

block2 = Block([q4, q5, q6, q7])
block2 = blocks.Block([q4, q5, q6, q7])

#didn't add all options
q8 = Question(oneof, "Question 8", [Option("lupe"), Option("marky mark"), Option("tony wonder")])
q9 = Question(oneof, "Question 9", [Option("whooopsie"), Option("daisy")])
q8 = questions.Question(oneof, "Question 8", [options.Option("lupe"), options.Option("marky mark"), options.Option("tony wonder")])
q9 = questions.Question(oneof, "Question 9", [options.Option("whooopsie"), options.Option("daisy")])

block3 = Block([q8, q9])
block3 = blocks.Block([q8, q9])

q10 = Question(oneof, "Her?", [])
q10 = questions.Question(oneof, "Her?", [])

block4 = Block([q10])
block4 = blocks.Block([q10])

q11 = Question(oneof, "Would you mind telling us how this survey made you feel?", [])
q11 = questions.Question(oneof, "Would you mind telling us how this survey made you feel?", [])

block5 = Block([q11])
block5 = blocks.Block([q11])

q12 = Question(oneof, "Did someone say wonder?", [])
q12 = questions.Question(oneof, "Did someone say wonder?", [])

block6 = Block([q12])
block6 = blocks.Block([q12])

branch1 = Constraint(q3)
branch1 = constraints.Constraint(q3)
branch1.add_branch_by_op_text("eggs", block2)
branch1.add_branch_by_op_text("ham", block3)

#two branch questions in one block
branch2 = Constraint(q1)
branch2 = constraints.Constraint(q1)
branch2.add_branch_by_index(0, block4)
branch2.add_branch_by_index(1, block3)
branch2.add_branch_by_index(2, block3)

block_list = [block1, block2, block3, block4, block5, block6]
branch_list = [branch1, branch2]

survey = Survey(block_list, branch_list)
survey = surveys.Survey(block_list, branch_list)

return survey
52 changes: 27 additions & 25 deletions surveyman/examples/TwoBranchesOneSubblock2.py
Original file line number Diff line number Diff line change
@@ -1,60 +1,62 @@
#example of invalid branching
#based on https://github.com/etosch/SurveyMan/blob/master/data/tests/test4_two_branches_one_block.csv
from surveyman.survey.surveys import *
from surveyman.survey.blocks import *
from surveyman.survey.constraints import *
import surveyman.survey.surveys as surveys
import surveyman.survey.blocks as blocks
import surveyman.survey.constraints as constraints
import surveyman.survey.questions as questions
import surveyman.survey.options as options


def create_survey():

oneof = "oneof"

q1 = Question(oneof, "Question 1", [Option("foo"), Option("bar"), Option("baz")])
q2 = Question(oneof, "Question 2", [Option("boo"), Option("far"), Option("faz")])
q3 = Question(oneof, "Question 3", [Option("eggs"), Option("ham")])
q1 = questions.Question(oneof, "Question 1", [options.Option("foo"), options.Option("bar"), options.Option("baz")])
q2 = questions.Question(oneof, "Question 2", [options.Option("boo"), options.Option("far"), options.Option("faz")])
q3 = questions.Question(oneof, "Question 3", [options.Option("eggs"), options.Option("ham")])

block1 = Block([q1, q2, q3])
block1 = blocks.Block([q1, q2, q3])

q4 = Question(oneof, "Question 4", [Option("oscar"), Option("lucille"), Option("george")])
q5 = Question(oneof, "Question 5", [Option("maeby"), Option("george")])
q6 = Question(oneof, "Question 6", [Option("gob"), Option("lindsay")])
q7 = Question(oneof, "Question 7", [Option("anne veal"), Option("gene parmesean")])
q4 = questions.Question(oneof, "Question 4", [options.Option("oscar"), options.Option("lucille"), options.Option("george")])
q5 = questions.Question(oneof, "Question 5", [options.Option("maeby"), options.Option("george")])
q6 = questions.Question(oneof, "Question 6", [options.Option("gob"), options.Option("lindsay")])
q7 = questions.Question(oneof, "Question 7", [options.Option("anne veal"), options.Option("gene parmesean")])

block2 = Block([q4, q5, q6, q7])
block2 = blocks.Block([q4, q5, q6, q7])

#didn't add all options
q8 = Question(oneof, "Question 8", [Option("lupe"), Option("marky mark"), Option("tony wonder")])
q9 = Question(oneof, "Question 9", [Option("whooopsie"), Option("daisy")])
q8 = questions.Question(oneof, "Question 8", [options.Option("lupe"), options.Option("marky mark"), options.Option("tony wonder")])
q9 = questions.Question(oneof, "Question 9", [options.Option("whooopsie"), options.Option("daisy")])

block3 = Block([q8, q9])
block3 = blocks.Block([q8, q9])

q10 = Question(oneof, "Her?", [])
q10 = questions.Question(oneof, "Her?", [])

block4 = Block([q10])
block4 = blocks.Block([q10])

q11 = Question(oneof, "Would you mind telling us how this survey made you feel?", [])
q11 = questions.Question(oneof, "Would you mind telling us how this survey made you feel?", [])

block5 = Block([q11])
block5 = blocks.Block([q11])

q12 = Question(oneof, "Did someone say wonder?", [])
q12 = questions.Question(oneof, "Did someone say wonder?", [])

block6 = Block([q12])
block6 = blocks.Block([q12])

branch1 = Constraint(q3)
branch1 = constraints.Constraint(q3)
branch1.add_branch_by_op_text("eggs", block2)
branch1.add_branch_by_op_text("ham", block3)

#two branch questions in one block
branch2 = Constraint(q1)
branch2 = constraints.Constraint(q1)
branch2.add_branch_by_index(0, block4)
branch2.add_branch_by_index(1, block3)
branch2.add_branch_by_index(2, block3)

block7 = Block([block1, block2, block3])
block7 = blocks.Block([block1, block2, block3])

block_list = [block7, block4, block5, block6]
branch_list = [branch1, branch2]

survey = Survey(block_list, branch_list)
survey = surveys.Survey(block_list, branch_list)

return survey

0 comments on commit d82564a

Please sign in to comment.