Modified group_ids
Merging in John's change to combine.py
iOS: camera preview size increased
iOS: Sends “Completion=False” to server if user cancels after uploading an image
Predict.py now gives top-1 and top-5 by class, WITH multiview. Test-batch has new test-many function. Dataprovider uses random steps
Multiview testing now in run.py
Added python socket and server to process jobs
Fixed runserver config issues
Fixed dataprovider bug and printout for new test_many
Corrected test_many logical breaks
iOS: Green Tint applied throughout
iOS: Changed to lighter green tint. Fixed result view image scrolling bug. Trying to take a picture when running on a device without a camera no longer causes a crash.
Client now works for multi-view inputs
Merge branch 'dev' of https://gitlab.doc.ic.ac.uk/bjm113/group-project-master into dev
Merging John's changes
iOS: camera view - user can swipe to change selected segment
Updated files with latest python script names
Merging changes - I updated the names of the python run scripts to the latest versions
updating vm dev conf to new ips
iOS: Deleting an item will stop further attempts to request it’s classification