From 620b424ec59eeee198b5ea2e65391fcb6ccb5a2e Mon Sep 17 00:00:00 2001 From: tihmels Date: Sun, 22 Oct 2017 19:40:59 +0200 Subject: [PATCH] UPDATE Projektstruktur --- .idea/medienverarbeitung17.projectmood.iml | 2 +- .idea/misc.xml | 2 +- Pipfile | 30 +-- Pipfile.lock | 247 --------------------- projectmood.py | 0 projectmood/helloworld.py | 0 projectmood/main.py | 42 ++++ 7 files changed, 51 insertions(+), 272 deletions(-) delete mode 100644 Pipfile.lock delete mode 100644 projectmood.py delete mode 100644 projectmood/helloworld.py create mode 100644 projectmood/main.py diff --git a/.idea/medienverarbeitung17.projectmood.iml b/.idea/medienverarbeitung17.projectmood.iml index 337ec92..55f49f9 100644 --- a/.idea/medienverarbeitung17.projectmood.iml +++ b/.idea/medienverarbeitung17.projectmood.iml @@ -4,7 +4,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 8b5945a..b7804d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Pipfile b/Pipfile index ea8e7c8..1d1a67b 100644 --- a/Pipfile +++ b/Pipfile @@ -5,31 +5,15 @@ verify_ssl = true name = "pypi" +[requires] + +python_version = '3.6' + + [packages] -alabaster = "==0.7.10" -Babel = "==2.5.1" -certifi = "==2017.7.27.1" -chardet = "==3.0.4" -docutils = "==0.14" -idna = "==2.6" -imagesize = "==0.7.1" -"Jinja2" = "==2.9.6" -MarkupSafe = "==1.0" -numpy = "==1.13.3" -opencv-python = "==3.3.0.10" -pbr = "==3.1.1" -Pygments = "==2.2.0" -pytz = "==2017.2" -requests = "==2.18.4" -snowballstemmer = "==1.2.1" -Sphinx = "==1.6.4" -sphinxcontrib-websupport = "==1.0.1" -stevedore = "==1.27.1" -"urllib3" = "==1.22" -virtualenv = "==15.1.0" -virtualenv-clone = "==0.2.6" -virtualenvwrapper = "==4.8.2" +opencv-python = "*" +matplotlib = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index a696266..0000000 --- a/Pipfile.lock +++ /dev/null @@ -1,247 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "5238d9e7482a4eb3a0e9c79728365a5ed3a2a4c19043139d132c1ae34bda32f6" - }, - "host-environment-markers": { - "implementation_name": "cpython", - "implementation_version": "3.6.3", - "os_name": "posix", - "platform_machine": "x86_64", - "platform_python_implementation": "CPython", - "platform_release": "17.2.0", - "platform_system": "Darwin", - "platform_version": "Darwin Kernel Version 17.2.0: Sun Oct 1 00:46:50 PDT 2017; root:xnu-4570.20.62~10/RELEASE_X86_64", - "python_full_version": "3.6.3", - "python_version": "3.6", - "sys_platform": "darwin" - }, - "pipfile-spec": 6, - "requires": {}, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.python.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "alabaster": { - "hashes": [ - "sha256:2eef172f44e8d301d25aff8068fddd65f767a3f04b5f15b0f4922f113aa1c732", - "sha256:37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0" - ], - "version": "==0.7.10" - }, - "babel": { - "hashes": [ - "sha256:f20b2acd44f587988ff185d8949c3e208b4b3d5d20fcab7d91fe481ffa435528", - "sha256:6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811" - ], - "version": "==2.5.1" - }, - "certifi": { - "hashes": [ - "sha256:54a07c09c586b0e4c619f02a5e94e36619da8e2b053e20f594348c0611803704", - "sha256:40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5" - ], - "version": "==2017.7.27.1" - }, - "chardet": { - "hashes": [ - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691", - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" - ], - "version": "==3.0.4" - }, - "docutils": { - "hashes": [ - "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6", - "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6", - "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274" - ], - "version": "==0.14" - }, - "idna": { - "hashes": [ - "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4", - "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f" - ], - "version": "==2.6" - }, - "imagesize": { - "hashes": [ - "sha256:6ebdc9e0ad188f9d1b2cdd9bc59cbe42bf931875e829e7a595e6b3abdc05cdfb", - "sha256:0ab2c62b87987e3252f89d30b7cedbec12a01af9274af9ffa48108f2c13c6062" - ], - "version": "==0.7.1" - }, - "jinja2": { - "hashes": [ - "sha256:2231bace0dfd8d2bf1e5d7e41239c06c9e0ded46e70cc1094a0aa64b0afeb054", - "sha256:ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff" - ], - "version": "==2.9.6" - }, - "markupsafe": { - "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" - ], - "version": "==1.0" - }, - "numpy": { - "hashes": [ - "sha256:910e7ae5eeee8d322775187692c5c66719cd58d230fbfd57245ea3cf75716910", - "sha256:f5c9ca457057cd5e12ddab36cded8b1f38bf1f45bf550d4ca2839b11ec57f597", - "sha256:d29e72413b66df23c75b9b469253c823698ea2e00f58e9e0df64b7a50696e8ac", - "sha256:539345898a4ae17421c159ae2a350901a5e6ce3da8f24168c6c67b3536e13de8", - "sha256:929928932f91082a168e36984179deddd58f8e98822ad2f33a2955d7c4eec596", - "sha256:62b09f3d1ea01d79c16a6642cb21599f53b9338c59971b2418a573155d2202ec", - "sha256:c4b1914d86c43399438518a2ac8bcba2fb64dd5a18efddded3783b9daae70933", - "sha256:6c6feb0647380db6e1d5d49ef9fb59c42240f25fb8df8b6e82ecb436c7e0621a", - "sha256:da2f47e46d7a93b73891d1981378717dc73c6ad5cc4fd23c934bfea7847fa958", - "sha256:4c767b6d9c9a071bb36ea34eb240ee5192fe0bc4c13be5e6c51e0350a30f7ac0", - "sha256:b2f98838f4bbc3bf23af7e97ffcad18a2dc6bbb0726796781e02b9347af6685f", - "sha256:11fcbed36c101a3b9c4636e791efccba82409ebbedaba938c97be8bdddd029cc", - "sha256:8969c8f987f8bcc3e30c014532cfc20e4a8f86a50c361596e086310853adacb7", - "sha256:2875e8055a1ea8d933b1c9d0f8714c0aa11c097bfadfcb8564c4d868fbf09a41", - "sha256:09b87d652c03508447d0f618e1d3ae57595acd3e0f0c11ac91bf68ed7bdb3a28", - "sha256:9cad35b911e150f00bb8080950c7e9f172714bbd0234f5ab74b4e3e2d9288b37", - "sha256:479863de17f66810db00bccf35289555365da45d3b053ccf539b95ab3b9c24f6", - "sha256:b162c6b044960b4ea0f42be049ce2af1d18c60f82748f0a27bd5ad182a731bf3", - "sha256:fa656dccfa9141774440575a6e7875d08b93f4a332eb5ae40877b26bed291c01", - "sha256:7dfa5b49fb2a080bd0d39bfbcff1177bacb14fcb28c857fd65fd0c18938935de", - "sha256:e8e0e75db757e41463888939d26c8058b4ecd25e563c597e9119f512dc0ee1da", - "sha256:c8dc6aa96882df6323bf9545934e37c6e05959bd789ae4b14d50509b093907aa", - "sha256:36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750" - ], - "version": "==1.13.3" - }, - "opencv-python": { - "hashes": [ - "sha256:862544f87d4cb6b64d0890c7174942fb671c4911b9337f237ac721b9f9116205", - "sha256:5013fc9ab4ac63ed8ec262dce15b1cb611ac602f2116aa9752198c326e027395", - "sha256:0a6e01953b97de2c0f8077b31a1422450d1da7a5fb42bcd018bc07259924b4ed", - "sha256:a553da9845dc418d6ee6f96dad28b3d32882f2a1177c64b3c713e06a97000003", - "sha256:a4b7a9db09e9d66206d470c7a3b645a3156c9ef535400091e5091c1b9a7a2df5", - "sha256:54a30fe217cbdad35ae653c03eb137117ee280082cc72cc970cd2d0149b9f1c6", - "sha256:150ed343c23952836a4fff954f8e4bbdc07f36449899459053700313d25c7ee0", - "sha256:eca0bdfc1b3cc6b16afe28d399024950841b29f8a6248121bfe9c683132cdb81", - "sha256:fd460bc75b40d3ab6f2f2a255378b5fb82e38bb183748b22d6ad31f3b13042d6", - "sha256:c8661f2eba4a04cceb4945695ad4e9e416359c6f434b40bd8a8da4fbbadef41e", - "sha256:e03b8d26410bbf56c59ba1277f9de71c0ad0bcd2dd81f80be3a07b6022f300fb", - "sha256:f965b9ef449859a783ead37d5e2be0e327e48f2439d79179efd568f2a8b6a1bc", - "sha256:dd8ce52b99ecf91d839ebbaf5b02c22ddfbee7e281b3c2d1afa4554b03bc65b2", - "sha256:73a0ed89a02c283420415f8b4b101fb21105caa9e884d641a1027774dcf05bed", - "sha256:f34e50215415d22440250cfc7c883812b54fb33e7feda78013aa8f27a593ef6d", - "sha256:66345a2c1f1ac1cb1e16b496ff697c7cc26de71f4219d2b5bb10650760151a3a", - "sha256:08b2a74ce6674a2bd2acd2efac90fdcd1e7c29b0a77ca88ffbc3a49494e86cc6", - "sha256:ae285117b47a4931b55953cc56200d7d94cbdebe5e974d8a440a33a2d9316875", - "sha256:3bf454a767aeb1f4d9d0c89c4b45046becd32a2a7ad9161803fa34043e70f893", - "sha256:bd019f786ed88098229cd47fb806f3033990d7d302e591d895cd43873d11e818", - "sha256:88c39fa85b871e31934c56a6d30a016c24ee98a75c2e9bf9964424ce13a43511", - "sha256:f1da252742a7f44e776a0e7fd4f333982911aa9ded033969ccef7a5cb2c30525" - ], - "version": "==3.3.0.10" - }, - "pbr": { - "hashes": [ - "sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac", - "sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1" - ], - "version": "==3.1.1" - }, - "pygments": { - "hashes": [ - "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d", - "sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc" - ], - "version": "==2.2.0" - }, - "pytz": { - "hashes": [ - "sha256:c883c2d6670042c7bc1688645cac73dd2b03193d1f7a6847b6154e96890be06d", - "sha256:03c9962afe00e503e2d96abab4e8998a0f84d4230fa57afe1e0528473698cdd9", - "sha256:487e7d50710661116325747a9cd1744d3323f8e49748e287bc9e659060ec6bf9", - "sha256:43f52d4c6a0be301d53ebd867de05e2926c35728b3260157d274635a0a947f1c", - "sha256:d1d6729c85acea5423671382868627129432fba9a89ecbb248d8d1c7a9f01c67", - "sha256:54a935085f7bf101f86b2aff75bd9672b435f51c3339db2ff616e66845f2b8f9", - "sha256:39504670abb5dae77f56f8eb63823937ce727d7cdd0088e6909e6dcac0f89043", - "sha256:ddc93b6d41cfb81266a27d23a79e13805d4a5521032b512643af8729041a81b4", - "sha256:f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589" - ], - "version": "==2017.2" - }, - "requests": { - "hashes": [ - "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", - "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" - ], - "version": "==2.18.4" - }, - "six": { - "hashes": [ - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb", - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9" - ], - "version": "==1.11.0" - }, - "snowballstemmer": { - "hashes": [ - "sha256:9f3bcd3c401c3e862ec0ebe6d2c069ebc012ce142cce209c098ccb5b09136e89", - "sha256:919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128" - ], - "version": "==1.2.1" - }, - "sphinx": { - "hashes": [ - "sha256:3e70eb94f7e81b47e0545ebc26b758193b6c8b222e152ded99b9c972e971c731", - "sha256:f101efd87fbffed8d8aca6ef307fec57693334f39d32efcbc2fc96ed129f4a3e" - ], - "version": "==1.6.4" - }, - "sphinxcontrib-websupport": { - "hashes": [ - "sha256:f4932e95869599b89bf4f80fc3989132d83c9faa5bf633e7b5e0c25dffb75da2", - "sha256:7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9" - ], - "version": "==1.0.1" - }, - "stevedore": { - "hashes": [ - "sha256:3dd075b275a9fa60f4702a24aaff65a4236490b52a52b7b29257346dd6a98267", - "sha256:236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0" - ], - "version": "==1.27.1" - }, - "urllib3": { - "hashes": [ - "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b", - "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" - ], - "version": "==1.22" - }, - "virtualenv": { - "hashes": [ - "sha256:39d88b533b422825d644087a21e78c45cf5af0ef7a99a1fc9fbb7b481e5c85b0", - "sha256:02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a" - ], - "version": "==15.1.0" - }, - "virtualenv-clone": { - "hashes": [ - "sha256:6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405" - ], - "version": "==0.2.6" - }, - "virtualenvwrapper": { - "hashes": [ - "sha256:137f7d4509283d798d64509a1a80c57d2d58d900d7a0f827ab67d3104abe232c", - "sha256:18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374" - ], - "version": "==4.8.2" - } - }, - "develop": {} -} diff --git a/projectmood.py b/projectmood.py deleted file mode 100644 index e69de29..0000000 diff --git a/projectmood/helloworld.py b/projectmood/helloworld.py deleted file mode 100644 index e69de29..0000000 diff --git a/projectmood/main.py b/projectmood/main.py new file mode 100644 index 0000000..8bf33c2 --- /dev/null +++ b/projectmood/main.py @@ -0,0 +1,42 @@ +class Car: + def __init__(self): + self.speed = 0 + self.odometer = 0 + self.time = 0 + + def say_state(self): + print("I'm going {} kph!".format(self.speed)) + + def accelerate(self): + self.speed += 5 + + def brake(self): + self.speed -= 5 + + def step(self): + self.odometer += self.speed + self.time += 1 + + def average_speed(self): + return self.odometer / self.time + + +if __name__ == '__main__': + my_car = Car() + print("I'm a car!") + while True: + action = input("What should I do? [A]ccelerate, [B]rake, " + "show [O]dometer, or show average [S]peed?").upper() + if action not in "ABOS" or len(action) != 1: + print("I don't know how to do that") + continue + if action == 'A': + my_car.accelerate() + elif action == 'B': + my_car.brake() + elif action == 'O': + print("The car has driven {} kilometers".format(my_car.odometer)) + elif action == 'S': + print("The car's average speed was {} kph".format(my_car.average_speed())) + my_car.step() + my_car.say_state() \ No newline at end of file -- GitLab