2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
649 Commits 1 Branch 0 Tags
6e5cbd3eb307949bb81b052612d52275ac808317
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2martens 505ea330fc Added missing creation of visualisation output directory 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 15:30:54 +02:00
2martens 45b5fda185 Made visualise work with all tarball ids 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 15:21:49 +02:00
2martens 8c31794aad Make sure trajectories are sorted before preparing them for Python 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 13:30:01 +02:00
2martens 4a4c23a66e Discard all images without gt again 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 13:01:34 +02:00
2martens e213ed62ec Fixed the number of images used for evaluation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 13:01:04 +02:00
2martens 60a9d63a1d Changed code to keep images without GT during evaluation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-25 12:04:47 +02:00
2martens 84adbe21fe Added code to visualise f1 scores to open set error 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-24 12:52:31 +02:00
2martens 761f6124e0 Prevented overwriting of saved images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-24 12:04:44 +02:00
2martens 5cba4046a5 Converted category ids to classes for SSD COCO case 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-24 11:59:09 +02:00
2martens 3330ce69e7 Added missing function argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-24 11:33:13 +02:00
2martens 856aad8e21 Added code to only take 30 frames of each trajectory in evaluation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 15:39:25 +02:00
2martens 7f14efcb6a Removed obsolete code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 14:21:14 +02:00
2martens f0a996423b Removed debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 13:57:13 +02:00
2martens 79c5df1805 Added debug print to visualise_metrics 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 13:48:07 +02:00
2martens f950504f20 Added missing network selection 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 13:46:15 +02:00
2martens 53472a8342 Added code to visualise metrics 
For starters, only precision/recall is visualised

Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 13:14:22 +02:00
2martens d6047665ef Added functionality to use SSD with COCO data set 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-23 11:21:06 +02:00
2martens e20167182f Added measurement of usable frames 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-22 16:32:47 +02:00
2martens 7359f52158 Disabled augmentation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-22 16:09:19 +02:00
2martens 2b656057af Enabled augmentations for training again 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-22 15:20:46 +02:00
2martens d1dadabc0d Removed guard clause and use 0 as precision/recall if no class predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 15:06:34 +02:00
2martens 1d21da8ca1 Fixed dtype of micro and macro precision/recall numpy arrays 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 15:02:26 +02:00
2martens 8897a65b3d Added additional guard clause for cases with no true/false positive entries 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 14:58:06 +02:00
2martens 60fb13cddf Added debug print for shape of true positives 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 14:53:44 +02:00
2martens 797323f6e9 Added debug print for diff to largest class 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 14:49:35 +02:00
2martens 84df7b64fa Really fixed entropy threshold keyword argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 14:00:17 +02:00
2martens a5555c5f73 Implemented micro and macro averaged metrics 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 13:40:19 +02:00
2martens 3b2f9fe4da Fixed entropy threshold keyword argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 13:27:40 +02:00
2martens 1a0398191a Removed checkpoint path from prepared paths for ssd test 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 12:46:57 +02:00
2martens 015befd542 Fixed config values 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-18 12:40:06 +02:00
2martens 71928650d3 Converted visualise to clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 15:41:08 +02:00
2martens cd79be4307 Added config option to test only pre-trained version of SSD 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 15:25:04 +02:00
2martens f34eb93e71 Added missing functions to evaluate module doc 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 13:56:21 +02:00
2martens b2e9a10bdf Removed obsolete import 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 13:54:06 +02:00
2martens 1db9fa1c0a Implemented cumulative open set error 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 13:53:52 +02:00
2martens 28a0d35d36 Implemented support for predicting with range of entropy thresholds 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 12:38:22 +02:00
2martens f270e0add1 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 12:01:07 +02:00
2martens d9edd94b99 Added entropy threshold as configurable option 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-17 11:54:28 +02:00
2martens a8f58a6fc7 Changed tarball id CLI option to string 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-16 13:29:49 +02:00
2martens 0280015a50 Modified measure mapping to select gt path based on tarball id 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-16 13:28:13 +02:00
2martens 13a3cb9170 Save category to names dictionary as well 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 17:20:35 +02:00
2martens 83f70b4fdb Fixed mixed up paths 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 16:56:51 +02:00
2martens 400b6e4900 Converted measure_mapping to clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 16:55:23 +02:00
2martens b819013771 Improved formatting 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 16:06:24 +02:00
2martens 758c8a7574 Improve filenames in measure_mapping 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 16:03:39 +02:00
2martens 5d955d9c3c Reverted previous change 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 14:47:59 +02:00
2martens 590b5e95ca Change f1 score to single value 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 14:46:09 +02:00
2martens c56440cb49 Added sorting of files after glob to ensure expected order 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 14:29:12 +02:00
2martens 4f4ff42d61 Changed code to also save filenames in evaluate 
Will need to be changed again if more than one trajectory is evaluated

Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 14:12:40 +02:00
2martens 83919b1464 Fixed opening of image 
Will need to be changed again if more than one trajectory is evaluated

Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 13:38:19 +02:00
2martens 289275e82f Changed _ssd_evaluate_save_images to save all images 
Will need to be changed again if more than one trajectory is evaluated

Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 13:34:54 +02:00
2martens 2f03be42dd Changed save_ssd_train_images func to work with filenames as well 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 13:25:47 +02:00
2martens 5aac93f444 Modified mean average precision to only use classes with ground truth 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 12:44:52 +02:00
2martens df2faaffe9 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 12:30:12 +02:00
2martens 3ec6f9ad0a Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 12:18:09 +02:00
2martens 13252b37b2 Changed code so that images are only saved on first batch 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 11:59:35 +02:00
2martens 135144efc8 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 11:46:41 +02:00
2martens 779249afff Added save image call after decoding images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 11:31:05 +02:00
2martens e0da7eca04 Save images only from one batch 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 11:07:20 +02:00
2martens 5c9eaab6e4 Fixed function calls 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 11:03:09 +02:00
2martens f66bf31785 Temporarily disabled save images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:59:04 +02:00
2martens a521bc4024 Moved print statements to predict loop 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:57:06 +02:00
2martens 78e00449ec Fixed print statement 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:54:04 +02:00
2martens 2ecc0023f8 Added debug prints to get shapes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:46:15 +02:00
2martens c0d23a731b Eliminate side effects from debug function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:43:18 +02:00
2martens 5827d92b8c Added function to save images directly after prediction 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-15 10:34:48 +02:00
2martens d77c27727f Fixed transformation of predictions (2nd) 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:34:26 +02:00
2martens ba3cfa379e Fixed transformation of predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:33:08 +02:00
2martens 38229e1848 Only save images from first batch in evaluate 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:19:56 +02:00
2martens c2be08e0c8 Changed code to save images with predictions not ground truth 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:13:17 +02:00
2martens 6f6b4b7e34 Fixed debug saving of images to work with predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:12:54 +02:00
2martens 8ef685dae9 Fixed unbatching of dict (2nd) 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:09:51 +02:00
2martens 8d1d78bdb6 Fixed unbatching of dict 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:09:21 +02:00
2martens 1474f30744 Added code to save images during ssd_evaluate 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 17:08:00 +02:00
2martens 50476fc3c0 Fixed name of accessed config value 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 16:25:18 +02:00
2martens 0d527cf26d Moved general purpose functions up 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 16:23:32 +02:00
2martens d53a0cb6b4 Made ssd_evaluate conform to clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 16:23:01 +02:00
2martens ab9f3f8a94 Removed obsolete constant N_CLASSES 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 16:06:05 +02:00