2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
607 Commits 1 Branch 0 Tags
d1dadabc0dc13fe71632849264e8a9e13e8f619c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2martens af62d0492c Fixed call of save function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 15:03:39 +02:00
2martens 73e4920cc4 Fixed mode for ssd model 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 15:01:49 +02:00
2martens fef7a1eac1 Added missing function argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 14:59:47 +02:00
2martens e8a82fbfaf Updated ssd_train function to use new signature of predict function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 14:56:42 +02:00
2martens 6c431e5e70 Moved public train function before the private functions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 14:55:20 +02:00
2martens fbcf2c261c Changed predict function to conform to clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 14:52:59 +02:00
2martens 718467e43c Moved private function to bottom 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:32:37 +02:00
2martens bc8c8b1c6f Removed not needed return doc 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:31:03 +02:00
2martens aa6960ceb2 Fixed type hint 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:30:19 +02:00
2martens 2d19ccf4a5 Changed ssd_train to use new compile_model function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:30:08 +02:00
2martens 06548dc8e5 Fixed typo 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:29:31 +02:00
2martens b30b332c7c Made ssd_test conform to clean code principles 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:29:06 +02:00
2martens ba2bd776ea Improved formatting 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:22:10 +02:00
2martens 0ae33130ad Made image size parameter more compatible with clean code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:22:01 +02:00
2martens 9fa525ebe3 Added extra functions to compile model and get loss function 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 12:20:34 +02:00
2martens a848c12d64 Cleaned up ssd module and removed no longer needed code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-11 11:24:06 +02:00
2martens 253a507c90 Fixed indexing of instance array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:36:33 +02:00
2martens b5058d9ee9 Updated debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:33:15 +02:00
2martens 82689ba6ec Added debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:31:02 +02:00
2martens ce87be6019 Added conversion to numpy array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:29:35 +02:00
2martens 25de799d80 Changed internal coordinates to corners 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:28:46 +02:00
2martens a685bba4fa Properly reversed encoding of labels to visualize them 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:26:16 +02:00
2martens a97b9d8d21 Set internal coordinates to "corners" 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 17:12:15 +02:00
2martens 4c4c05d383 Made it possible to save images without preventing training 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 16:29:39 +02:00
2martens d517c343be Modified code to save images before and after encoding 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 16:16:08 +02:00
2martens c2d8da39c8 Fixed calculation of bbox coordinates 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 16:11:14 +02:00
2martens 4f6611ec6c Updated train_keras to work with SSD model directly 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 16:05:31 +02:00
2martens 67c098b0d6 Added conversion to int for class_id 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 16:01:18 +02:00
2martens aaec64786c Added debug print of class_id 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:55:01 +02:00
2martens 7969716e6d Made function compatible with encoded and decoded labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:51:20 +02:00
2martens e6370ee92e Fixed function call 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:46:08 +02:00
2martens 093cbe472e Changed code to save debug images from processed but not encoded labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:38:06 +02:00
2martens 21cef4a09e Made ssd_train function compatible with clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:25:18 +02:00
2martens ed3fec54af Added function to retrieve SSD model 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:24:49 +02:00
2martens b01cda512a Added some config values 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 15:23:30 +02:00
2martens d8d7b51655 Made load_scenenet_data more compatible with clean code principles 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 14:52:55 +02:00
2martens 91b7febabb Changed train function to be an integration 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 12:15:17 +02:00
2martens a90c6c7c92 Modified debug module to conform to clean code standards 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 12:12:13 +02:00
2martens 4cf6723c28 Added ability to use custom string for debug save of train images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 12:02:10 +02:00
2martens b926d11b84 Fixed path for train images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-10 11:59:34 +02:00
2martens db53c35929 Skip background boxes when saving training images 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 15:34:05 +02:00
2martens 90fe1be4a6 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 14:21:57 +02:00