LMS-1883 DynamiX: minor tool impr

SVN: 18957

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/tools/feature_converter/FeatureVectorConverter.java

@@ -54,7 +54,7 @@ public class FeatureVectorConverter
         List<InputRowsNamedCollection> experiments = InputRowsHelper.extract(list);
         for (InputRowsNamedCollection e : experiments)
         {
-            String outName = e.getName() + "__" + inFile.getName();
+            String outName = e.getName() + ".csv";
             File outFile =
                     FileUtilities.createNextNumberedFile(new File(inFile.getParent(), outName),
                             null);

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/tools/feature_converter/Features.java

@@ -154,8 +154,17 @@ public class Features
     /** NOTE: Order strictly connected with {@link #getColumns()} */
     public static List<String> getHeaderColumns()
     {
-        return Arrays.asList(END_LOCALIZATION, INITIAL_LOCALIZATION, INTENSITY_CHANGE,
-                LOCALIZATION_CHANGE, POSITION, QUALITY, QUALITY_DESC, SIDE);
+        return Arrays.asList(asHeader(END_LOCALIZATION, "End Localization"),
+                asHeader(INITIAL_LOCALIZATION, "Initial Localization"),
+                asHeader(INTENSITY_CHANGE, "Intensity Change"),
+                asHeader(LOCALIZATION_CHANGE, "Localization Change"), asHeader(POSITION, "Position"),
+                asHeader(QUALITY, "Quality"), asHeader(QUALITY_DESC, "Quality Description"),
+                asHeader(SIDE, "Side"));
+    }
+
+    static String asHeader(String code, String label)
+    {
+        return "<" + code + "> " + label;
     }
 
     /** NOTE: Order strictly connected with {@link #getHeaderColumns()} */

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/tools/feature_converter/OutputRow.java

@@ -29,7 +29,7 @@ final class OutputRow extends Features
 
     private static final String CATEGORY = "category";
 
-    private static final String WELL_NAME = "well_name";
+    private static final String WELL_NAME = "WellName";
 
     private String wellName;
 
@@ -62,7 +62,7 @@ final class OutputRow extends Features
     {
         ArrayList<String> list = new ArrayList<String>();
         list.add(WELL_NAME);
-        list.add(CATEGORY);
+        list.add(Features.asHeader(CATEGORY, "Category"));
         list.addAll(Features/* super class */.getHeaderColumns());
         return list;
     }