2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
727 Commits 1 Branch 0 Tags
06be98f59f9cb5faba5a1252b9a01b860dfdadfc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
2martens 06be98f59f Prevented cut off label text 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-16 12:15:39 +02:00
2martens 34d7128a1c Made labels more visible 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-16 12:10:34 +02:00
2martens 5f7870b92f Fixed check for nesting level of colors array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-16 12:10:16 +02:00
2martens 4fc8bb6f8c Added function to draw single bbox figure 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-16 11:39:31 +02:00
2martens 554ccc84f9 Moved code into separate functions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-16 11:04:43 +02:00
2martens 8230488031 Save predictions directly before observations are grouped 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-14 13:43:28 +02:00
2martens 6a990b204a Fixed per-class grouping of predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 13:48:58 +02:00
2martens 75f4e4cb1e Optimised position of saving predictions after observations are grouped 
Before the entropy threshold is applied, there is no difference
between the entropy thresholds. Therefore, the predictions should only
be saved once.

Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 13:05:09 +02:00
2martens d877da3ef3 Improved readability of code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 13:00:14 +02:00
2martens 01f43651b5 Fixed ssd train function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 12:35:52 +02:00
2martens 5bde170138 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 12:25:24 +02:00
2martens dd2d0f407b Added config option to enable/disable dropout 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 12:25:13 +02:00
2martens 53022bf1a9 Added saving of predictions before entropy threshold 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 12:15:54 +02:00
2martens 681d23f345 Removed obsolete code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 11:56:26 +02:00
2martens 64300c3842 Reduced parameter size for predict function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 11:55:19 +02:00
2martens 90d64ae7c7 Added use_nms config option 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 11:47:18 +02:00
2martens 3d78309603 Made NMS configurable 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-13 11:41:39 +02:00
2martens 343d832545 Added no NMS run to combined graphs 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-12 17:53:15 +02:00
2martens 5e50be22dc Updated predictions glob string for new suffixes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-12 17:41:00 +02:00
2martens b861270e51 Save predictions directly after entropy threshold is applied as well 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-12 15:24:33 +02:00
2martens c0e7b434dc Added suffix to save function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-12 15:23:45 +02:00
2martens aa114c7237 Added _env to gitignore 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-12 12:06:02 +02:00
2martens c3286b7169 Set limits to figures 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-11 12:07:51 +02:00
2martens 56a635e5e6 Dealt with different keys in stored metrics files 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-11 11:35:18 +02:00
2martens 9d82b9bd5c Removed obsolete import 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-11 11:34:55 +02:00
2martens 60b40bc53e Removed unnecessary argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-11 11:29:36 +02:00
2martens 2c226e9975 Added CLI command to visualise a combined graph 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-11 11:25:47 +02:00
2martens 6f543b947e Removed entropy from structured array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-09 09:32:48 +02:00
2martens a91ff8cc22 Fixed filtering for Bayesian SSD 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-09 08:56:08 +02:00
2martens 909d8f7bef Fixed Bayesian NMS 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-08 22:57:10 +02:00
2martens ec03b0df4e Added NMS for Bayesian SSD 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-08 22:00:34 +02:00
2martens a41f607ca9 Changed filtering to occur per-class 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-08 21:47:00 +02:00
2martens aaaea5f942 Added if clause to check for empty instance 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-08 21:45:32 +02:00
2martens eef8839657 Unified naming of evaluation results 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-04 12:12:30 +02:00
2martens 0ae13a2fba Added support for entropy thresholds in visualise metrics 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-04 11:55:19 +02:00
2martens de8001c2d3 Save json with indent level 2 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-04 11:41:54 +02:00
2martens 6b56ba9aba Changed annotation meta file to speed up saving images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-04 11:39:15 +02:00
2martens 5df06bbfa6 Fixed serialisation of scores 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-03 12:44:35 +02:00
2martens 66d81f3362 Fixed path names 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-03 12:44:21 +02:00
2martens e1ff56c5d3 Added missing metrics 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-03 12:16:31 +02:00
2martens f9e489b435 Added attributedict to dependencies 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 16:55:02 +02:00
2martens 32b23bd55d Overhauled functions to minimize parameter count 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 15:31:28 +02:00
2martens 0498bd03c6 Improved formatting 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:25:22 +02:00
2martens ee38a74382 Added SonarQube project properties 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:23:33 +02:00
2martens 8aac3ae30f Added doc comments to public functions in cli module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:23:10 +02:00
2martens a8d64ce9c2 Duplicated project dependencies in requirements.txt file 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:20:50 +02:00
2martens 6e85ab86eb Shortened code for execute action 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:19:00 +02:00
2martens d58179fa2a Removed obsolete auto-encoder code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:10:12 +02:00
2martens afdf7c96aa Clarified initialise config function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 13:00:19 +02:00
2martens ad96c5b156 Removed obsolete local imports 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 11:02:56 +02:00
2martens f9c2605603 Simplified evaluate get results function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-02 10:58:06 +02:00
2martens 686bfcaf40 Fixed evaluation wrt labels and filenames 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-01 13:23:02 +02:00
2martens 9c91f82cc3 Added support for entropy thresholds in evaluate function(s) 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-01 13:05:21 +02:00
2martens b483fad5af Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-09-01 13:04:45 +02:00
2martens b49087f415 Added yet another empty check 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 15:43:08 +02:00
2martens 25e39edbcd Added check for empty detections in top k application 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 15:04:32 +02:00
2martens da322e287f Made sure top k is only applied when necessary 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 15:00:23 +02:00
2martens 343d7e9bea Fixed creation of structured array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 15:00:00 +02:00
2martens 9b3d9a550b Added top k filtering for bayesian ssd 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 14:02:57 +02:00
2martens 599f7d8957 Fixed indexing 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 13:37:36 +02:00
2martens cf132a89f0 Fixed application of entropy threshold 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 13:31:13 +02:00
2martens c403560b99 Added none check 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 12:33:42 +02:00
2martens f440a03f29 Added checks for empty detection lists 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 12:30:23 +02:00
2martens ac9d639c10 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 12:30:07 +02:00
2martens d98434fcfe Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 12:13:40 +02:00
2martens a09ce1a1b6 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 11:47:54 +02:00
2martens b4b6c7a777 Implemented Bayesian SSD decoding pipeline 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-29 11:47:39 +02:00
2martens 639d04747d Provide top_k to decode function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-12 19:26:12 +02:00
2martens ef38ba29c1 Changed size of saved images to 640x480 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-12 19:07:34 +02:00
2martens 032b407e42 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-12 18:14:48 +02:00
2martens 9752f285d1 Fixed incompatibilities between numpy arrays and set 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-12 18:11:52 +02:00
2martens 82a370c10f Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-12 18:04:13 +02:00
2martens d71a135c4b Optimized retrieving detections in dropout step 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 20:17:52 +02:00
2martens 7be3ee5d4f Improved formatting 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 18:01:55 +02:00
2martens 30b2cb9b28 Fixed path for pre-trained weights file 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 17:21:59 +02:00
2martens b645c8d3ff Added rounding to limit float precision problems 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 16:30:34 +02:00
2martens 9c56c2e514 Skip ground truth boxes that belong to outlier classes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:58:17 +02:00
2martens 588e66c772 Only the first batch size images are saved on evaluate 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:36:39 +02:00
2martens 6e5cbd3eb3 Fixed the colour space for saving images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:32:59 +02:00
2martens 39f74fb3bf Changed data code to load all images for testing 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:30:41 +02:00
2martens 4a8d072b97 Made evaluation compatible with Caffe-like decoding 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:17:33 +02:00
2martens 6ce6e4a195 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:13:53 +02:00
2martens 17fcd4a426 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:12:11 +02:00
2martens 82de20e190 Added support for Caffe implementation to debug module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 15:03:35 +02:00
2martens 8ad0d50b3b Changed decoding function to Caffe-like implementation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 14:56:59 +02:00
2martens 0fbcf0d9ad Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 14:54:16 +02:00
2martens a223a9dad7 Only load inlier annotations for COCO 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 14:10:06 +02:00
2martens 36a9ca7c83 Improved formatting 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 13:50:34 +02:00
2martens 72c821dc2a Changed pre-trained weights file to sub-sampled one 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 13:49:46 +02:00
2martens 5a0ae208d3 Added code to sub-sample weights file to 60 classes + background 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-11 13:48:38 +02:00
2martens facc6c9b1f Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-07 13:45:12 +02:00
2martens 49490aa05b Colour channels were already swapped 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-07 13:45:02 +02:00
2martens b123e90821 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-07 13:24:49 +02:00
2martens 00b756b10a Added conversion back to RGB before saving images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-07 13:24:01 +02:00
2martens 05d113a4ba Convert image input to BGR 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-07 13:20:34 +02:00
2martens 29522921f1 Fixed typo 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-05 13:48:21 +02:00
2martens 37d5e32031 Added confidence threshold to config 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-05 13:46:04 +02:00
2martens f4982e364c Made iou threshold actually count 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-08-05 13:44:34 +02:00
2martens 6576f3d5e1 Removed mapping from 'tap' to fire hydrant 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 16:54:06 +02:00
2martens 6034198262 Changed limit for used images to 32 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 15:33:41 +02:00