From 1a7678b37a25a76aeaef7ebb225f85406b19f928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20=C5=BDabkar?= Date: Mon, 12 Oct 2015 14:16:14 +0200 Subject: malenkosti... --- robot/problems/introduction/forward/common.py | 52 ++++++++++++++++++++------- robot/problems/introduction/forward/en.py | 21 ++++------- robot/problems/introduction/forward/sl.py | 31 ++++++++-------- 3 files changed, 62 insertions(+), 42 deletions(-) (limited to 'robot/problems/introduction/forward') diff --git a/robot/problems/introduction/forward/common.py b/robot/problems/introduction/forward/common.py index 5023d7f..d1e1193 100644 --- a/robot/problems/introduction/forward/common.py +++ b/robot/problems/introduction/forward/common.py @@ -1,6 +1,8 @@ # coding=utf-8 -from server.hints import Hint +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 = 202 group = 'introduction' @@ -13,21 +15,47 @@ from ev3dev import * from mindstorms_widgets import mindstorms_widgets robot = mindstorms_widgets() -robot.connect_motor('left') -robot.connect_motor('right') +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) -robot.move_steering('on', power=50) -time.sleep(3) -robot.move_steering('off', brake_at_end=True) +robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ) ''' hint_type = { - 'ev3dev': Hint('ev3dev'), - 'mindWidgets': Hint('mindWidgets'), + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveSteering': Hint('moveSteering'), + 'onForSeconds': Hint('onForSeconds'), + 'direction': Hint('direction'), + 'seconds': Hint('seconds'), } -def test(program): - return False, [] +def hint( code): + tokens = get_tokens(code) -def hint(program): - return [] + # 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 has_token_sequence(tokens, ['on_for_seconds']): + return [{'id': 'onForSeconds'}] + + if not has_token_sequence(tokens, ['direction']): + return [{'id': 'direction'}] + + if not has_token_sequence(tokens, ['seconds']): + return [{'id': 'seconds'}] + + return None diff --git a/robot/problems/introduction/forward/en.py b/robot/problems/introduction/forward/en.py index d943867..f8e1730 100644 --- a/robot/problems/introduction/forward/en.py +++ b/robot/problems/introduction/forward/en.py @@ -1,24 +1,15 @@ # coding=utf-8 +import server +mod = server.problems.load_language('python', 'en') id = 202 -name = 'Forward' -slug = 'Forward' +name = 'Forward 3s' +slug = 'Forward 3s' description = '''\ -

Robot should drive forward in a straight line and stop after three -seconds.

+

Write a program that would make the robot drive straight forward for 3 seconds and stop

''' -plan = [] - hint = { - 'ev3dev': '''\ -

To work with the robot you should import the ev3dev module: -from ev3dev import *.

-''', - - 'mindWidgets': '''\ -

To work with the robot you should import the mindstorms_widgets module: -from mindstorms_widgets import mindstorms_widgets.

-''', + } diff --git a/robot/problems/introduction/forward/sl.py b/robot/problems/introduction/forward/sl.py index 98f3a8d..9a37b3c 100644 --- a/robot/problems/introduction/forward/sl.py +++ b/robot/problems/introduction/forward/sl.py @@ -1,23 +1,24 @@ # coding=utf-8 +import server +mod = server.problems.load_language('python', 'sl') id = 202 -name = 'Naprej' -slug = 'Naprej' +name = 'Naprej 3s' +slug = 'Naprej 3s' description = '''\ -

Robot naj pelje naravnost naprej in se po treh sekundah ustavi.

-''' - -plan = [] +

Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.

''' hint = { - 'ev3dev': '''\ -

Za delo z robotom moramo uvoziti modul ev3dev: -from ev3dev import *.

-''', - - 'mindWidgets': '''\ -

Za delo z robotom moramo uvoziti modul mindstorms_widgets: -from mindstorms_widgets import mindstorms_widgets.

-''', + '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 3 sekunde.

''', + '''

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=3 ).

'''], } -- cgit v1.2.1 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/forward/common.py | 7 ++- robot/problems/introduction/forward/common.py~ | 60 ++++++++++++++++++++++++++ robot/problems/introduction/forward/en.py~ | 20 +++++++++ robot/problems/introduction/forward/sl.py | 6 ++- robot/problems/introduction/forward/sl.py~ | 23 ++++++++++ 5 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 robot/problems/introduction/forward/common.py~ create mode 100644 robot/problems/introduction/forward/en.py~ create mode 100644 robot/problems/introduction/forward/sl.py~ (limited to 'robot/problems/introduction/forward') diff --git a/robot/problems/introduction/forward/common.py b/robot/problems/introduction/forward/common.py index f6330fd..b3fa8a9 100644 --- a/robot/problems/introduction/forward/common.py +++ b/robot/problems/introduction/forward/common.py @@ -9,7 +9,6 @@ number = 1 visible = True solution = '''\ -import time from ev3dev import * from mindstorms_widgets import mindstorms_widgets @@ -48,13 +47,13 @@ def hint( code): if not has_token_sequence(tokens, ['move_steering']): return [{'id': 'moveSteering'}] - if not has_token_sequence(tokens, ['on_for_seconds']): + if not 'on_for_seconds' in code: return [{'id': 'onForSeconds'}] - if not has_token_sequence(tokens, ['direction']): + if not 'direction' in code: return [{'id': 'direction'}] - if not has_token_sequence(tokens, ['seconds']): + if not 'seconds' in code: return [{'id': 'seconds'}] return None diff --git a/robot/problems/introduction/forward/common.py~ b/robot/problems/introduction/forward/common.py~ new file mode 100644 index 0000000..f6330fd --- /dev/null +++ b/robot/problems/introduction/forward/common.py~ @@ -0,0 +1,60 @@ +# 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 = 202 +number = 1 +visible = True + +solution = '''\ +import time +from ev3dev import * +from mindstorms_widgets import mindstorms_widgets + +robot = mindstorms_widgets() +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) + +robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ) +''' + +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'), +} + +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 has_token_sequence(tokens, ['on_for_seconds']): + return [{'id': 'onForSeconds'}] + + if not has_token_sequence(tokens, ['direction']): + return [{'id': 'direction'}] + + if not has_token_sequence(tokens, ['seconds']): + return [{'id': 'seconds'}] + + return None diff --git a/robot/problems/introduction/forward/en.py~ b/robot/problems/introduction/forward/en.py~ new file mode 100644 index 0000000..4337ac5 --- /dev/null +++ b/robot/problems/introduction/forward/en.py~ @@ -0,0 +1,20 @@ +# coding=utf-8 +import server +mod = server.problems.load_language('python', 'en') + +<<<<<<< HEAD +id = 202 +name = 'Forward 3s' +slug = 'Forward 3s' +======= +name = 'Forward' +slug = 'Forward' +>>>>>>> 5a01c2bb184152c6ccc3c536e9b857d247bc55ad + +description = '''\ +

Write a program that would make the robot drive straight forward for 3 seconds and stop

+''' + +hint = { + +} diff --git a/robot/problems/introduction/forward/sl.py b/robot/problems/introduction/forward/sl.py index 837380b..a6f7e86 100644 --- a/robot/problems/introduction/forward/sl.py +++ b/robot/problems/introduction/forward/sl.py @@ -8,8 +8,10 @@ description = '''\ 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' ).

'''], + '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 3 sekunde.

''', '''

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.

''', diff --git a/robot/problems/introduction/forward/sl.py~ b/robot/problems/introduction/forward/sl.py~ new file mode 100644 index 0000000..a6f7e86 --- /dev/null +++ b/robot/problems/introduction/forward/sl.py~ @@ -0,0 +1,23 @@ +# coding=utf-8 + +name = 'Naprej 3s' +slug = 'Naprej 3s' + +description = '''\ +

Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.

''' + +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 3 sekunde.

''', + '''

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=3 ).

'''], +} -- 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/forward/common.py~ | 60 -------------------------- robot/problems/introduction/forward/en.py~ | 20 --------- robot/problems/introduction/forward/sl.py~ | 23 ---------- 3 files changed, 103 deletions(-) delete mode 100644 robot/problems/introduction/forward/common.py~ delete mode 100644 robot/problems/introduction/forward/en.py~ delete mode 100644 robot/problems/introduction/forward/sl.py~ (limited to 'robot/problems/introduction/forward') diff --git a/robot/problems/introduction/forward/common.py~ b/robot/problems/introduction/forward/common.py~ deleted file mode 100644 index f6330fd..0000000 --- a/robot/problems/introduction/forward/common.py~ +++ /dev/null @@ -1,60 +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 = 202 -number = 1 -visible = True - -solution = '''\ -import time -from ev3dev import * -from mindstorms_widgets import mindstorms_widgets - -robot = mindstorms_widgets() -robot.connect_motor( 'left' ) -robot.connect_motor( 'right' ) - -robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ) -''' - -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'), -} - -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 has_token_sequence(tokens, ['on_for_seconds']): - return [{'id': 'onForSeconds'}] - - if not has_token_sequence(tokens, ['direction']): - return [{'id': 'direction'}] - - if not has_token_sequence(tokens, ['seconds']): - return [{'id': 'seconds'}] - - return None diff --git a/robot/problems/introduction/forward/en.py~ b/robot/problems/introduction/forward/en.py~ deleted file mode 100644 index 4337ac5..0000000 --- a/robot/problems/introduction/forward/en.py~ +++ /dev/null @@ -1,20 +0,0 @@ -# coding=utf-8 -import server -mod = server.problems.load_language('python', 'en') - -<<<<<<< HEAD -id = 202 -name = 'Forward 3s' -slug = 'Forward 3s' -======= -name = 'Forward' -slug = 'Forward' ->>>>>>> 5a01c2bb184152c6ccc3c536e9b857d247bc55ad - -description = '''\ -

Write a program that would make the robot drive straight forward for 3 seconds and stop

-''' - -hint = { - -} diff --git a/robot/problems/introduction/forward/sl.py~ b/robot/problems/introduction/forward/sl.py~ deleted file mode 100644 index a6f7e86..0000000 --- a/robot/problems/introduction/forward/sl.py~ +++ /dev/null @@ -1,23 +0,0 @@ -# coding=utf-8 - -name = 'Naprej 3s' -slug = 'Naprej 3s' - -description = '''\ -

Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.

''' - -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 3 sekunde.

''', - '''

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=3 ).

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