Add call to Code features evaluator

Author: oshando

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/features/FeatureSet.java

@@ -196,6 +196,7 @@ public void evaluateFeatureData(Set<Method> methods) {
         for (FeatureSet.Type featureSet : featureSets)
             switch (featureSet) {
                 case CODE:
+                    codeFeatureHandler.evaluateCodeFeatureData(methods);
                     break;
                 case DOC_MANUAL:
                     docFeatureHandler.evaluateManualFeatureData(methods);
@@ -276,39 +277,27 @@ public ArrayList<Instance> getCodeInstances(Instances instances, Set<Method> met
             Instance inst = setClassValues(categories, method, instances, new DenseInstance(attributes.size()));
             inst.setDataset(instances);
 
-            for (Category cat : categories) {
-                if (cat.isAuthentication() && !method.getAuthSrm().isEmpty()) {
+            //Set id attribute
+            inst.setValue(instances.attribute("id"), method.getArffSafeSignature());
 
-                    if (toolkit == ModelEvaluator.Toolkit.MEKA)
-                        inst.setValue(instances.attribute(cat.getId()), "1");
-                    else {
-                        for (Category auth : method.getAuthSrm()) {
-                            inst.setValue(instances.attribute(cat.getId()), getAuthClass(auth));
-                        }
-                    }
-                } else if (method.getAllCategories().contains(cat)) {
-                    inst.setValue(instances.attribute(cat.getId()), "1");
-                } else
-                    inst.setValue(instances.attribute(cat.getId()), "0");
-            }
+            //TODO Add feature values
+            //for (Class<? extends IDocFeature> feature : codeFeatureHandler.getClass()) {
 
+           // }
             for (Map.Entry<IFeature, Attribute> entry : codeAttributes.entrySet()) {
 
                 switch (entry.getKey().applies(method)) {
                     case TRUE:
-                        inst.setValue(instances.attribute(String.valueOf(entry.getKey())), "true");
+                        inst.setValue(instances.attribute(entry.getKey().toString()), "true");
                         break;
                     case FALSE:
-                        inst.setValue(instances.attribute(String.valueOf(entry.getKey())), "false");
+                        inst.setValue(instances.attribute(entry.getKey().toString()), "false");
                         break;
                     default:
-                        inst.setMissing(instances.attribute(String.valueOf(entry.getKey())));
+                        inst.setMissing(instances.attribute(entry.getKey().toString()));
                 }
             }
 
-            //Set id attribute
-            inst.setValue(instances.attribute("id"), method.getArffSafeSignature());
-
             instanceList.add(inst);
             instanceMap.put(method.getArffSafeSignature(), instanceIndex++);
         }
@@ -376,8 +365,12 @@ public ArrayList<Instance> getDocInstances(Instances instances, Set<Method> meth
         return instanceList;
     }
 
-
-    String getAuthClass(Category category){
+    /**
+     * Returns authentication class ID for a authentication category.
+     * @param category
+     * @return Class ID
+     */
+    String getAuthClass(Category category) {
 
         switch (category) {
             case AUTHENTICATION_TO_LOW:
@@ -386,15 +379,17 @@ String getAuthClass(Category category){
                 return "2";
             case AUTHENTICATION_TO_HIGH:
             default:
-             return "3";
+                return "3";
         }
     }
 
     Instance setClassValues(Set<Category> categories, Method method, Instances instances, Instance inst) {
 
         for (Category cat : categories) {
 
-            if (cat.isAuthentication() && !method.getAuthSrm().isEmpty() && toolkit == ModelEvaluator.Toolkit.WEKA) {
+            if (instances.relationName().endsWith("test")) {
+                inst.setMissing(instances.attribute(cat.getId()));
+            } else if (cat.isAuthentication() && !method.getAuthSrm().isEmpty() && toolkit == ModelEvaluator.Toolkit.WEKA) {
 
                 for (Category auth : method.getAuthSrm()) {
                     inst.setValue(instances.attribute(cat.getId()), getAuthClass(auth));
@@ -455,4 +450,8 @@ public DocFeatureHandler getDocFeatureHandler() {
     public void setDocFeatureHandler(DocFeatureHandler docFeatureHandler) {
         this.docFeatureHandler = docFeatureHandler;
     }
+
+    public Dataset getDataset() {
+        return dataset;
+    }
 }

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/features/code/CodeFeatureHandler.java

@@ -1,6 +1,7 @@
 package de.fraunhofer.iem.swan.features.code;
 
 import de.fraunhofer.iem.swan.data.Category;
+import de.fraunhofer.iem.swan.data.Method;
 import de.fraunhofer.iem.swan.features.code.type.*;
 import de.fraunhofer.iem.swan.features.code.type.MethodClassModifierFeature.ClassModifier;
 import de.fraunhofer.iem.swan.features.code.type.MethodModifierFeature.Modifier;
@@ -27,6 +28,10 @@ public CodeFeatureHandler() {
 
     }
 
+    public void evaluateCodeFeatureData(Set<Method> methodSet) {
+        //TODO refactor code features implementation to be similar to the doc features
+    }
+
     private void addFeature(IFeature feature, Set<Category> categoriesForFeature) {
 
         for (Category category : categoriesForFeature) {
@@ -1225,6 +1230,6 @@ private void getFeaturesSize() {
             featuresCount.put(c.toString(), features);
             count += features;
         }
-        logger.info("{} Features,  distribution={}", count, featuresCount);
+        logger.info("Created {} code features,  distribution of methods={}", count, featuresCount);
     }
 }