pc

diff --git a/laboration3/uppgift_1.py b/laboration3/uppgift_1.py
index 345b74042c998dcaa91cc685789abbf6e844a141..0c0b92073671714fa8458db66cf17c3c38f37673 100644 (file)
--- a/laboration3/uppgift_1.py
+++ b/laboration3/uppgift_1.py
@@ -21,8 +21,8 @@ def increment_dictionary_value1(key, d):
     d[key] += 1
 
 
-def increment_dictionary_value2(key, value, d):
-    if key not in value:
+def increment_dictionary_value2(key, d):
+    if key not in d:
         d[key] = 1
     else:
         d[key] += 1
@@ -41,9 +41,10 @@ def return_value_list1(prefix, d):
 
 
 def value_exists2(value, d):
-    for d in d.values:
-        if "__contains__" in dir(d):
-            if value in d:
-                return True
-    else:
-        return False
+    for v in d.values():
+        if v == value:
+            return True
+        elif isinstance(v, list) and value in v:
+            return True
+        
+    return False
\ No newline at end of file

diff --git a/uppgift_1.txt b/uppgift_1.txt
new file mode 100644 (file)
index 0000000..0f75ecc
--- /dev/null
+++ b/uppgift_1.txt
@@ -0,0 +1,21 @@
+UEsDBBQAAAAIAEdKR1REFzSfLgEAAFYDAAAaABwAbmlsZm8zNTktcHl1cHBnM18xL29yaWcucHlV
+VAkAA8bVAGLG1QBidXgLAAEEehxpWQQA4fUFhVJNb4MwDL3zKyztAlpViR4rcd0v2E6oQhExU9TU
+oCSl5d/P+eiAdms5BdvvPfvZb/A1DN+qc1BmmcQOjjg1eFXW2ZyfG5DFPgP+DLqzIZ8GRSCzWD0K
+fcZUX+bh7wESogG0DU+bFwktpGxc30jVuih2RyBrjh6givEFiPDS9KSnp2gVhgHqXRCPwX9pFbUG
+T0guEKqehJmaUFCujUjo98o79gK6W0Nfd1SGEGqLD8mFYPItmq/Z+/KJfVsxDEgyLufmfFzNimEw
+2KnrjHbcZQX1Ifx0vYEjC8Q1Kocn3uLcoh+s3mukxFLwLBXE91yVWH8bKpZXwok/bmp3f1O+kXF9
+TKs2Ri8cMmvdpPJpeOG3GGoGKKvIOkEt5uMGvBUFCJLz1Y6viZZzfAhe3g9QSwMEFAAAAAgAR0pH
+VEawZ9CvAAAAYAEAACQAHABuaWxmbzM1OS1weXVwcGczXzEvcHl1cHBndGVzdDNfMS5sb2dVVAkA
+A8bVAGLG1QBidXgLAAEEehxpWQQA4fUF41IGAgVv/6AgV+8QBZ/D04JDHBVCAwLcPd1CXIMUQLJc
+XCC+goKxnqGeoZWCoYFCQf7hJXnpekjiRjjEjXGIm+AQN7VSMMImboZD3ByHuAUO8y1R1HOBPR8c
+6uvrqBDgf7jFzx2ozdhAT0HD0MBAISk14/C2smJNiCqXUoXDS4oUCopSczJzM/OA7BIFd38Xb6Au
+F4WCw0sVAipLMvLzSgsK0jPTSkCWKXIpKHABAFBLAwQUAAAACABHSkdUW1gtfHkAAACUAAAAGwAc
+AG5pbGZvMzU5LXB5dXBwZzNfMS9pbmZvLnR4dFVUCQADxtUAYsbVAGJ1eAsAAQR6HGlZBADh9QVF
+zEEOgyAURdE5q2ADtvABETZjEPiWFJWoDNx9YdTkje5LTnB3tJQCAxhYm6bMWD5ZLkm94tmuPWU8
+hDIEU47Uf6L/xtB6LWVNeM/8VR5ynGlNu8t0C+qqG1WSawgmLM47rUfw2ixSSD0hoBwF/tmhPF0S
+M393pGM/UEsBAh4DFAAAAAgAR0pHVEQXNJ8uAQAAVgMAABoAGAAAAAAAAQAAAKSBAAAAAG5pbGZv
+MzU5LXB5dXBwZzNfMS9vcmlnLnB5VVQFAAPG1QBidXgLAAEEehxpWQQA4fUFUEsBAh4DFAAAAAgA
+R0pHVEawZ9CvAAAAYAEAACQAGAAAAAAAAQAAAKSBggEAAG5pbGZvMzU5LXB5dXBwZzNfMS9weXVw
+cGd0ZXN0M18xLmxvZ1VUBQADxtUAYnV4CwABBHocaVkEAOH1BVBLAQIeAxQAAAAIAEdKR1RbWC18
+eQAAAJQAAAAbABgAAAAAAAEAAACkgY8CAABuaWxmbzM1OS1weXVwcGczXzEvaW5mby50eHRVVAUA
+A8bVAGJ1eAsAAQR6HGlZBADh9QVQSwUGAAAAAAMAAwArAQAAXQMAAAAA
\ No newline at end of file