closes #23

Author: printsev

src/main/java/com/epam/parso/DataWriterUtil.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -60,7 +61,7 @@ public final class DataWriterUtil {
     private static final String HOURS_OUTPUT_FORMAT = "%02d";
 
     /**
-     * The format to output minutes in the the CSV format.
+     * The format to output minutes in the CSV format.
      */
     private static final String MINUTES_OUTPUT_FORMAT = "%02d";
 
@@ -81,6 +82,13 @@ public final class DataWriterUtil {
      */
     private static final List<String> TIME_FORMAT_STRINGS = Arrays.asList("TIME", "HHMM");
 
+    /**
+     * The format to store the percentage values. Appear in the data of
+     * the {@link com.epam.parso.impl.SasFileParser.FormatAndLabelSubheader} subheader
+     * and are stored in {@link Column#format}.
+     */
+    private static final String PERCENT_FORMAT = "PERCENT";
+
     /**
      * The number of seconds in a minute.
      */
@@ -96,6 +104,12 @@ public final class DataWriterUtil {
      */
     private static final Locale DEFAULT_LOCALE = Locale.getDefault();
 
+    /**
+     * The format to output percentage values in the CSV format. This format is used
+     * when {@link ColumnFormat#precision} does not contain the accuracy of rounding.
+     */
+    private static final DecimalFormat ZERO_PRECISION_FORMAT = new DecimalFormat("0%");
+
     /**
      * These are sas7bdat format references to {@link java.text.SimpleDateFormat} date formats.
      * <p>
@@ -204,6 +218,8 @@ private static String processEntry(Column column, Object entry, Locale locale) t
             } else {
                 if (TIME_FORMAT_STRINGS.contains(column.getFormat().getName())) {
                     valueToPrint = convertTimeElementToString((Long) entry);
+                } else if (PERCENT_FORMAT.equals(column.getFormat().getName())) {
+                    valueToPrint = convertPercentElementToString(entry, column.getFormat());
                 } else {
                     valueToPrint = String.valueOf(entry);
                     if (entry.getClass() == Double.class) {
@@ -274,6 +290,24 @@ private static String convertDoubleElementToString(Double value) {
         return valueToPrint;
     }
 
+    /**
+     * The function to convert a percent element into a string. The accuracy of rounding
+     * is stored in {@link Column#format}.
+     * @param value the input numeric value to convert.
+     * @param columnFormat the column format containing the precision of rounding the converted value.
+     * @return the string with the text presentation of the input numeric value.
+     */
+    private static String convertPercentElementToString(Object value, ColumnFormat columnFormat) {
+        Double doubleValue = value instanceof Long ? ((Long) value).doubleValue() : (Double) value;
+        DecimalFormat df = ZERO_PRECISION_FORMAT;
+        int precision = columnFormat.getPrecision();
+        if (precision != 0) {
+            String pattern = "0%." + new String(new char[precision]).replace("\0", "0");
+            df = new DecimalFormat(pattern);
+        }
+        return df.format(doubleValue);
+    }
+
     /**
      * The function to remove trailing zeros from the decimal part of the numerals represented by a string.
      * If there are no digits after the point, the point is deleted as well.

src/test/resources/csv/test-columnar.csv

@@ -0,0 +1,12 @@
+recnum,square,desc,pctdone,pctincr,date,datetime,time
+0,0,This is row            0 of           10,0%,,01-01-1960,01Jan1960:00:00:01.00,00:00:01
+1,1,This is row            1 of           10,10%,0.0%,02-01-1960,01Jan1960:00:00:10.00,00:00:03
+2,4,This is row            2 of           10,20%,50.0%,17-01-1960,01Jan1960:00:01:40.00,00:00:09
+3,9,This is row            3 of           10,30%,66.7%,22-03-1960,01Jan1960:00:16:40.00,00:00:27
+4,16,This is row            4 of           10,40%,75.0%,13-09-1960,01Jan1960:02:46:40.00,00:01:21
+5,25,This is row            5 of           10,50%,80.0%,17-09-1961,02Jan1960:03:46:40.00,00:04:03
+6,36,This is row            6 of           10,60%,83.3%,20-07-1963,12Jan1960:13:46:40.00,00:12:09
+7,49,This is row            7 of           10,70%,85.7%,29-07-1966,25Apr1960:17:46:40.00,00:36:27
+8,64,This is row            8 of           10,80%,87.5%,20-03-1971,03Mar1963:09:46:40.00,01:49:21
+9,81,This is row            9 of           10,90%,88.9%,18-12-1977,09Sep1991:01:46:40.00,05:28:03
+10,100,This is row           10 of           10,100%,90.0%,19-05-1987,19Nov2276:17:46:40.00,16:24:09

src/test/resources/csv/test-columnar_meta.csv

@@ -0,0 +1,9 @@
+Number,Name,Type,Data length,Format,Label
+1,recnum,Numeric,8,,Record Number
+2,square,Numeric,8,,Square of the Record Number
+3,desc,Character,200,,Description of the Row
+4,pctdone,Numeric,8,PERCENT8.,Percent Done
+5,pctincr,Numeric,8,PERCENT7.1,Percent Increment
+6,date,Numeric,8,DDMMYYD10.,
+7,datetime,Numeric,8,DATETIME.,
+8,time,Numeric,8,TIME.,