Remove backup files and add *~ to .gitignore

3 files changed, 0 insertions, 103 deletions

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 = '''\
-<p>Write a program that would make the robot drive straight forward for 3 seconds and stop</p>
-'''
-
-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 = '''\
-<p>Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.</p>'''
-
-hint = {
-    'mW_init':['''<p>Robota v programu predstavimo z mindstorms_widgets(): <code>robot = mindstorms_widgets()</code>.</p>'''],
-    'connectMotorLeft':['''<p>Robotu priključi levi motor</p>''',
-                 '''<p><code>robot.connect_motor( 'left' )</code>.</p>'''],
-    'connectMotorRight':['''<p>Robotu priključi desni motor</p>''',
-                 '''<p><code>robot.connect_motor( 'right' )</code>.</p>'''],
-    'moveSteering':['''<p>Sinhroniziraj motorja in ju zaženi za 3 sekunde.</p>''',
-                    '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( ... )</code>.</p>'''],
-    'onForSeconds':['''<p>Prvi argument metode <code>robot.move_steering</code> naj pove, da bo delovanje motorjev časovno omejeno.</p>''',
-                    '''<p><code>robot.move_steering('on_for_seconds', ... )</code>.</p>'''],
-    'direction':['''<p>Navedi smer premikanja motorjev, naravnost = 0.</p>''',
-                    '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, ... )</code>.</p>'''],
-    'seconds':['''<p>Napiši časovno omejitev v sekundah.</p>''',
-                    '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, seconds=3 )</code>.</p>'''],
-}