From 1e5d42ba53ea0c631dbc6f21887839c91571ebca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20=C5=BDabkar?= Date: Tue, 13 Oct 2015 12:24:41 +0200 Subject: Uvodne vaje za robotiko --- robot/problems/introduction/square20/common.py | 76 ++++++++++++++++++++++ robot/problems/introduction/square20/common.py~ | 76 ++++++++++++++++++++++ robot/problems/introduction/square20/en.py | 14 ++++ .../introduction/square20/naloga04_square20.py | 21 ++++++ robot/problems/introduction/square20/sl.py | 29 +++++++++ robot/problems/introduction/square20/sl.py~ | 27 ++++++++ 6 files changed, 243 insertions(+) create mode 100644 robot/problems/introduction/square20/common.py create mode 100644 robot/problems/introduction/square20/common.py~ create mode 100644 robot/problems/introduction/square20/en.py create mode 100644 robot/problems/introduction/square20/naloga04_square20.py create mode 100644 robot/problems/introduction/square20/sl.py create mode 100644 robot/problems/introduction/square20/sl.py~ (limited to 'robot/problems/introduction/square20') diff --git a/robot/problems/introduction/square20/common.py b/robot/problems/introduction/square20/common.py new file mode 100644 index 0000000..f868a1c --- /dev/null +++ b/robot/problems/introduction/square20/common.py @@ -0,0 +1,76 @@ +# coding=utf-8 + +from python.util import has_token_sequence, string_almost_equal, \ + string_contains_number, get_tokens, get_numbers, get_exception_desc +from server.hints import Hint, HintSequence + +id = 213 +group = 'introduction' +number = 4 +visible = True + +solution = '''\ +from ev3dev import * +from mindstorms_widgets import mindstorms_widgets + +robot = mindstorms_widgets() +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) + +turntime = .95 +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +''' + +hint_type = { + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveSteering': Hint('moveSteering'), + 'onForSeconds': Hint('onForSeconds'), + 'direction': Hint('direction'), + 'seconds': Hint('seconds'), + 'moveTank': Hint('moveTank'), + 'lrPower': Hint('lrPower') +} + +def hint( code): + tokens = get_tokens(code) + + # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program + if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']): + return [{'id': 'mW_init'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']): + return [{'id': 'connectMotorLeft'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']): + return [{'id': 'connectMotorRight'}] + + if not has_token_sequence(tokens, ['move_steering']): + return [{'id': 'moveSteering'}] + + if not 'on_for_seconds' in code: + return [{'id': 'onForSeconds'}] + + if not 'direction' in code: + return [{'id': 'direction'}] + + if not 'seconds' in code: + return [{'id': 'seconds'}] + + if not has_token_sequence(tokens, ['move_tank']): + return [{'id': 'moveTank'}] + + if not 'lr_power' in code: + return [{'id': 'lrPower'}] + + return None diff --git a/robot/problems/introduction/square20/common.py~ b/robot/problems/introduction/square20/common.py~ new file mode 100644 index 0000000..f868a1c --- /dev/null +++ b/robot/problems/introduction/square20/common.py~ @@ -0,0 +1,76 @@ +# coding=utf-8 + +from python.util import has_token_sequence, string_almost_equal, \ + string_contains_number, get_tokens, get_numbers, get_exception_desc +from server.hints import Hint, HintSequence + +id = 213 +group = 'introduction' +number = 4 +visible = True + +solution = '''\ +from ev3dev import * +from mindstorms_widgets import mindstorms_widgets + +robot = mindstorms_widgets() +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) + +turntime = .95 +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +''' + +hint_type = { + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveSteering': Hint('moveSteering'), + 'onForSeconds': Hint('onForSeconds'), + 'direction': Hint('direction'), + 'seconds': Hint('seconds'), + 'moveTank': Hint('moveTank'), + 'lrPower': Hint('lrPower') +} + +def hint( code): + tokens = get_tokens(code) + + # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program + if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']): + return [{'id': 'mW_init'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']): + return [{'id': 'connectMotorLeft'}] + + # if code does not include connect_motor statement, a student needs to learn about how to connect the motors + if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']): + return [{'id': 'connectMotorRight'}] + + if not has_token_sequence(tokens, ['move_steering']): + return [{'id': 'moveSteering'}] + + if not 'on_for_seconds' in code: + return [{'id': 'onForSeconds'}] + + if not 'direction' in code: + return [{'id': 'direction'}] + + if not 'seconds' in code: + return [{'id': 'seconds'}] + + if not has_token_sequence(tokens, ['move_tank']): + return [{'id': 'moveTank'}] + + if not 'lr_power' in code: + return [{'id': 'lrPower'}] + + return None diff --git a/robot/problems/introduction/square20/en.py b/robot/problems/introduction/square20/en.py new file mode 100644 index 0000000..907acfe --- /dev/null +++ b/robot/problems/introduction/square20/en.py @@ -0,0 +1,14 @@ +# coding=utf-8 +import server +mod = server.problems.load_language('python', 'en') + +id = 213 +name = 'Square 20' +slug = 'Square 20' + +description = '''\ +''' + +hint = { + +} diff --git a/robot/problems/introduction/square20/naloga04_square20.py b/robot/problems/introduction/square20/naloga04_square20.py new file mode 100644 index 0000000..171c4b8 --- /dev/null +++ b/robot/problems/introduction/square20/naloga04_square20.py @@ -0,0 +1,21 @@ +#!/usr/bin/python + +print "Robot naj enkrat prevozi kvadrat s stranico 20 cm." + +import time +from ev3dev import * +from mindstorms_widgets import mindstorms_widgets + +robot = mindstorms_widgets() +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) + +turntime = .95 +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) +robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) +robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) \ No newline at end of file diff --git a/robot/problems/introduction/square20/sl.py b/robot/problems/introduction/square20/sl.py new file mode 100644 index 0000000..f52ddf7 --- /dev/null +++ b/robot/problems/introduction/square20/sl.py @@ -0,0 +1,29 @@ +# coding=utf-8 + +name = 'Kvadrat 20 cm' +slug = 'Kvadrat 20 cm' + +description = '''\ +

Robot naj enkrat prevozi kvadrat s stranico 20 cm.

''' + +hint = { + 'mW_init':['''

Robota v programu predstavimo z mindstorms_widgets(): robot = mindstorms_widgets().

'''], + 'connectMotorLeft':['''

Robotu priključi levi motor

''', + '''

robot.connect_motor( 'left' ).

'''], + 'connectMotorRight':['''

Robotu priključi desni motor

''', + '''

robot.connect_motor( 'right' ).

'''], + 'moveSteering':['''

Sinhroniziraj motorja in ju zaženi.

''', + '''

Za sinhronizirano vožnjo je najbolj primerna metoda robot.move_steering( ... ).

'''], + 'onForSeconds':['''

Prvi argument metode robot.move_steering naj pove, da bo delovanje motorjev časovno omejeno.

''', + '''

robot.move_steering('on_for_seconds', ... ).

'''], + 'direction':['''

Navedi smer premikanja motorjev, naravnost = 0.

''', + '''

robot.move_steering( 'on_for_seconds', direction=0, ... ).

'''], + 'seconds':['''

Napiši časovno omejitev v sekundah.

''', + '''

robot.move_steering( 'on_for_seconds', direction=0, seconds=... ).

''', + '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

''',], + 'moveTank': ['''

Robot naj se obrne na mestu.

''', + '''

Najprimernejša metoda za to je move_tank

''', + '''

robot.move_tank( 'on_for_seconds', ... ).

'''], + 'lrPower': ['''

Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.

''', + '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

'''], +} diff --git a/robot/problems/introduction/square20/sl.py~ b/robot/problems/introduction/square20/sl.py~ new file mode 100644 index 0000000..aa5137e --- /dev/null +++ b/robot/problems/introduction/square20/sl.py~ @@ -0,0 +1,27 @@ +# coding=utf-8 + +name = 'Kvadrat 20 cm' +slug = 'Kvadrat 20 cm' + +description = '''\ +

Robot naj enkrat prevozi kvadrat s stranico 20 cm.

''' + +hint = { + 'mW_init':['''

Robota v programu predstavimo z mindstorms_widgets(): robot = mindstorms_widgets().

'''], + 'connectMotorLeft':['''

Robotu moramo priključiti levi motor: robot.connect_motor( 'left' ).

'''], + 'connectMotorRight':['''

Robotu moramo priključiti desni motor: robot.connect_motor( 'right' ).

'''], + 'moveSteering':['''

Sinhroniziraj motorja in ju zaženi.

''', + '''

Za sinhronizirano vožnjo je najbolj primerna metoda robot.move_steering( ... ).

'''], + 'onForSeconds':['''

Prvi argument metode robot.move_steering naj pove, da bo delovanje motorjev časovno omejeno.

''', + '''

robot.move_steering('on_for_seconds', ... ).

'''], + 'direction':['''

Navedi smer premikanja motorjev, naravnost = 0.

''', + '''

robot.move_steering( 'on_for_seconds', direction=0, ... ).

'''], + 'seconds':['''

Napiši časovno omejitev v sekundah.

''', + '''

robot.move_steering( 'on_for_seconds', direction=0, seconds=... ).

''', + '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

''',], + 'moveTank': ['''

Robot naj se obrne na mestu.

''', + '''

Najprimernejša metoda za to je move_tank

''', + '''

robot.move_tank( 'on_for_seconds', ... ).

'''], + 'lrPower': ['''

Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.

''', + '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

'''], +} -- cgit v1.2.1 From a86a6ca92d315dedf3ce4d5035a4c38178f8b531 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 13 Oct 2015 13:00:05 +0200 Subject: Remove backup files and add *~ to .gitignore --- robot/problems/introduction/square20/common.py~ | 76 ------------------------- robot/problems/introduction/square20/sl.py~ | 27 --------- 2 files changed, 103 deletions(-) delete mode 100644 robot/problems/introduction/square20/common.py~ delete mode 100644 robot/problems/introduction/square20/sl.py~ (limited to 'robot/problems/introduction/square20') diff --git a/robot/problems/introduction/square20/common.py~ b/robot/problems/introduction/square20/common.py~ deleted file mode 100644 index f868a1c..0000000 --- a/robot/problems/introduction/square20/common.py~ +++ /dev/null @@ -1,76 +0,0 @@ -# coding=utf-8 - -from python.util import has_token_sequence, string_almost_equal, \ - string_contains_number, get_tokens, get_numbers, get_exception_desc -from server.hints import Hint, HintSequence - -id = 213 -group = 'introduction' -number = 4 -visible = True - -solution = '''\ -from ev3dev import * -from mindstorms_widgets import mindstorms_widgets - -robot = mindstorms_widgets() -robot.connect_motor( 'left' ) -robot.connect_motor( 'right' ) - -turntime = .95 -robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) -robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) -robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) -robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) -robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) -robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) -robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 ) -robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime ) -''' - -hint_type = { - 'mW_init': Hint('mW_init'), - 'connectMotorLeft': Hint('connectMotorLeft'), - 'connectMotorRight': Hint('connectMotorRight'), - 'moveSteering': Hint('moveSteering'), - 'onForSeconds': Hint('onForSeconds'), - 'direction': Hint('direction'), - 'seconds': Hint('seconds'), - 'moveTank': Hint('moveTank'), - 'lrPower': Hint('lrPower') -} - -def hint( code): - tokens = get_tokens(code) - - # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program - if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']): - return [{'id': 'mW_init'}] - - # if code does not include connect_motor statement, a student needs to learn about how to connect the motors - if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']): - return [{'id': 'connectMotorLeft'}] - - # if code does not include connect_motor statement, a student needs to learn about how to connect the motors - if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']): - return [{'id': 'connectMotorRight'}] - - if not has_token_sequence(tokens, ['move_steering']): - return [{'id': 'moveSteering'}] - - if not 'on_for_seconds' in code: - return [{'id': 'onForSeconds'}] - - if not 'direction' in code: - return [{'id': 'direction'}] - - if not 'seconds' in code: - return [{'id': 'seconds'}] - - if not has_token_sequence(tokens, ['move_tank']): - return [{'id': 'moveTank'}] - - if not 'lr_power' in code: - return [{'id': 'lrPower'}] - - return None diff --git a/robot/problems/introduction/square20/sl.py~ b/robot/problems/introduction/square20/sl.py~ deleted file mode 100644 index aa5137e..0000000 --- a/robot/problems/introduction/square20/sl.py~ +++ /dev/null @@ -1,27 +0,0 @@ -# coding=utf-8 - -name = 'Kvadrat 20 cm' -slug = 'Kvadrat 20 cm' - -description = '''\ -

Robot naj enkrat prevozi kvadrat s stranico 20 cm.

''' - -hint = { - 'mW_init':['''

Robota v programu predstavimo z mindstorms_widgets(): robot = mindstorms_widgets().

'''], - 'connectMotorLeft':['''

Robotu moramo priključiti levi motor: robot.connect_motor( 'left' ).

'''], - 'connectMotorRight':['''

Robotu moramo priključiti desni motor: robot.connect_motor( 'right' ).

'''], - 'moveSteering':['''

Sinhroniziraj motorja in ju zaženi.

''', - '''

Za sinhronizirano vožnjo je najbolj primerna metoda robot.move_steering( ... ).

'''], - 'onForSeconds':['''

Prvi argument metode robot.move_steering naj pove, da bo delovanje motorjev časovno omejeno.

''', - '''

robot.move_steering('on_for_seconds', ... ).

'''], - 'direction':['''

Navedi smer premikanja motorjev, naravnost = 0.

''', - '''

robot.move_steering( 'on_for_seconds', direction=0, ... ).

'''], - 'seconds':['''

Napiši časovno omejitev v sekundah.

''', - '''

robot.move_steering( 'on_for_seconds', direction=0, seconds=... ).

''', - '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

''',], - 'moveTank': ['''

Robot naj se obrne na mestu.

''', - '''

Najprimernejša metoda za to je move_tank

''', - '''

robot.move_tank( 'on_for_seconds', ... ).

'''], - 'lrPower': ['''

Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.

''', - '''

robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 ).

'''], -} -- cgit v1.2.1