[many] Fixes to get resources.py working again

bob/bio/vein/configurations/algorithms.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ..algorithms import MiuraMatch
+from ..algorithms.MiuraMatch import MiuraMatch
 
 huangwl_tool = MiuraMatch(ch=18, cw=28)
 huangwl_gpu_tool = MiuraMatch(ch=18, cw=28, gpu=True)

bob/bio/vein/configurations/extractors/lbp.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...extractors import LocalBinaryPatterns
+from ...extractors.LocalBinaryPatterns import LocalBinaryPatterns
 
 # Parameters
 

bob/bio/vein/configurations/extractors/maximum_curvature.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...extractors import LocalBinaryPatterns
+from ...extractors.MaximumCurvature import MaximumCurvature
 
 
 # Parameters
@@ -10,9 +10,7 @@ SIGMA_DERIVATES = 5 #Sigma used for determining derivatives
 GPU_ACCELERATION = False
 
 #Define feature extractor
-feature_extractor = bob.fingervein.features.MaximumCurvature(
-	sigma = SIGMA_DERIVATES,
-	gpu = GPU_ACCELERATION
-
-)
-
+feature_extractor = MaximumCurvature(
+    sigma = SIGMA_DERIVATES,
+    gpu = GPU_ACCELERATION,
+    )

bob/bio/vein/configurations/extractors/normalised_crosscorr.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...extractors import NormalisedCrossCorrelation
+from ...extractors.NormalisedCrossCorrelation import NormalisedCrossCorrelation
 
-feature_extractor = bob.fingervein.features.NormalisedCrossCorrelation()
+feature_extractor = NormalisedCrossCorrelation()

bob/bio/vein/configurations/extractors/repeated_line_tracking.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...extractors import RepeatedLineTracking
+from ...extractors.RepeatedLineTracking import RepeatedLineTracking
 
 # Maximum number of iterations
 NUMBER_ITERATIONS = 3000

bob/bio/vein/configurations/extractors/wide_line_detector.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-import bob.fingervein
+from ...extractors.WideLineDetector import WideLineDetector
 
-# Parameters
-RADIUS_NEIGHBOURHOOD_REGION = 5 # Radius of the circular neighbourhood region
+# Radius of the circular neighbourhood region
+RADIUS_NEIGHBOURHOOD_REGION = 5
 NEIGHBOURHOOD_THRESHOLD = 1
-SUM_NEIGHBOURHOOD = 41 #Sum of neigbourhood threshold
+
+#Sum of neigbourhood threshold
+SUM_NEIGHBOURHOOD = 41
 RESCALE = True
 
-#Define feature extractor
-feature_extractor = bob.fingervein.features.WideLineDetector(
-  radius = RADIUS_NEIGHBOURHOOD_REGION,
-      threshold = NEIGHBOURHOOD_THRESHOLD,
-  g = SUM_NEIGHBOURHOOD,
-  rescale = RESCALE
-)
 
+feature_extractor = WideLineDetector(
+    radius=RADIUS_NEIGHBOURHOOD_REGION,
+    threshold=NEIGHBOURHOOD_THRESHOLD,
+    g=SUM_NEIGHBOURHOOD,
+    rescale=RESCALE
+    )

bob/bio/vein/configurations/preprocessors/finger_crop_None_CircGabor.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...preprocessors import FingerCrop
+from ...preprocessors.FingerCrop import FingerCrop
 
 # Contour localization mask
 CONTOUR_MASK_HEIGHT = 4 # Height of the mask

bob/bio/vein/configurations/preprocessors/finger_crop_None_HE.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...preprocessors import FingerCrop
+from ...preprocessors.FingerCrop import FingerCrop
 
 # Contour localization mask
 CONTOUR_MASK_HEIGHT = 4 # Height of the mask

bob/bio/vein/configurations/preprocessors/finger_crop_None_HFE.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...preprocessors import FingerCrop
+from ...preprocessors.FingerCrop import FingerCrop
 
 
 # Contour localization mask
@@ -26,5 +26,5 @@ preprocessor = FingerCrop(
     preprocessing=PREPROCESSING,
     fingercontour=FINGERCONTOUR,
     postprocessing=POSTPROCESSING,
-    gpu=GPU_ACCELERATION
+    gpu=GPU_ACCELERATION,
     )

bob/bio/vein/configurations/preprocessors/finger_crop_None_None.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-from ...preprocessors import FingerCrop
+from ...preprocessors.FingerCrop import FingerCrop
 
 
 # Contour localization mask

bob/bio/vein/extractors/LocalBinaryPatterns.py

@@ -6,7 +6,7 @@ import numpy
 import bob.ip.base
 import bob.io.base
 
-from bob.bio.base.features.Extractor import Extractor
+from bob.bio.base.extractor import Extractor
 
 
 class LocalBinaryPatterns (Extractor):

bob/bio/vein/extractors/MaximumCurvature.py

@@ -7,7 +7,7 @@ import numpy
 import bob.core
 import bob.io.base
 
-from bob.bio.base.features.Extractor import Extractor
+from bob.bio.base.extractor import Extractor
 
 from .. import utils
 

bob/bio/vein/extractors/NormalisedCrossCorrelation.py

@@ -5,7 +5,7 @@ import numpy
 
 import bob.io.base
 
-from bob.bio.base.features.Extractor import Extractor
+from bob.bio.base.extractor import Extractor
 
 
 class NormalisedCrossCorrelation (Extractor):

bob/bio/vein/extractors/RepeatedLineTracking.py

@@ -8,7 +8,7 @@ import bob.core
 import bob.io.base
 import bob.ip.base
 
-from bob.bio.base.features.Extractor import Extractor
+from bob.bio.base.extractor import Extractor
 
 
 class RepeatedLineTracking (Extractor):

bob/bio/vein/extractors/WideLineDetector.py

@@ -8,7 +8,7 @@ import scipy.misc
 import bob.io.base
 import bob.ip.base
 
-from bob.bio.base.features.Extractor import Extractor
+from bob.bio.base.extractor import Extractor
 
 
 class WideLineDetector (Extractor):

setup.py

@@ -48,11 +48,11 @@ setup(
 
       # registered feature extractors
       'bob.bio.extractor': [
-        'ncc-normalisedcrosscorr = bob.bio.vein.configurations.extractors.normalised_crosscorr:feature_extractor',
-        'mc-maximumcurvature = bob.bio.vein.configurations.extractors.maximum_curvature:feature_extractor',
-        'rlt-repeatedlinetracking = bob.bio.vein.configurations.extractors.repeated_line_tracking:feature_extractor',
-        'wld-widelinedetector = bob.bio.vein.configurations.extractors.wide_line_detector:feature_extractor',
-        'lbp-localbinarypatterns = bob.bio.vein.configurations.extractors.lbp:feature_extractor',
+        'normalisedcrosscorr = bob.bio.vein.configurations.extractors.normalised_crosscorr:feature_extractor',
+        'maximumcurvature = bob.bio.vein.configurations.extractors.maximum_curvature:feature_extractor',
+        'repeatedlinetracking = bob.bio.vein.configurations.extractors.repeated_line_tracking:feature_extractor',
+        'widelinedetector = bob.bio.vein.configurations.extractors.wide_line_detector:feature_extractor',
+        'localbinarypatterns = bob.bio.vein.configurations.extractors.lbp:feature_extractor',
       ],
 
       # registered fingervein recognition algorithms