diff --git a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java index ff772edb..ff67e8ea 100644 --- a/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java +++ b/rabbit-core/src/main/java/org/ohdsi/rabbitInAHat/dataModel/Database.java @@ -209,7 +209,6 @@ public static Database generateModelFromScanReport(String filename) { field.setDescription(row.getStringByHeaderName(ScanFieldName.DESCRIPTION)); field.setFractionEmpty(row.getDoubleByHeaderName(ScanFieldName.FRACTION_EMPTY)); field.setUniqueCount(row.getIntByHeaderName(ScanFieldName.UNIQUE_COUNT)); - field.setFractionUnique(row.getDoubleByHeaderName(ScanFieldName.FRACTION_UNIQUE)); field.setValueCounts(getValueCounts(workbook, tableName, fieldName)); table.getFields().add(field); diff --git a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java index 6d55a4b9..a8e60913 100644 --- a/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java +++ b/rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java @@ -645,7 +645,6 @@ private void doOpenScanReport(String filename) { oldField.setDescription(newField.getDescription()); oldField.setFractionEmpty(newField.getFractionEmpty()); oldField.setUniqueCount(newField.getUniqueCount()); - oldField.setFractionUnique(newField.getFractionUnique()); oldField.setNullable(newField.isNullable()); oldField.setValueCounts(newField.getValueCounts()); } else { diff --git a/whiterabbit/src/main/java/org/ohdsi/whiterabbit/scan/SourceDataScan.java b/whiterabbit/src/main/java/org/ohdsi/whiterabbit/scan/SourceDataScan.java index 2a6296ec..a353c9c4 100644 --- a/whiterabbit/src/main/java/org/ohdsi/whiterabbit/scan/SourceDataScan.java +++ b/whiterabbit/src/main/java/org/ohdsi/whiterabbit/scan/SourceDataScan.java @@ -329,8 +329,7 @@ private void createFieldOverviewSheet() { overviewHeader.addAll(Arrays.asList( ScanFieldName.N_ROWS_CHECKED, ScanFieldName.FRACTION_EMPTY, - ScanFieldName.UNIQUE_COUNT, - ScanFieldName.FRACTION_UNIQUE + ScanFieldName.UNIQUE_COUNT )); if (calculateNumericStats) { overviewHeader.addAll(Arrays.asList( @@ -363,12 +362,10 @@ private void createFieldOverviewSheet() { if (scanValues) { Long uniqueCount = fieldInfo.uniqueCount; - Double fractionUnique = fieldInfo.getFractionUnique(); values.addAll(Arrays.asList( fieldInfo.nProcessed, fieldInfo.getFractionEmpty(), - fieldInfo.hasValuesTrimmed() ? String.format("<= %d", uniqueCount) : uniqueCount, - fieldInfo.hasValuesTrimmed() ? String.format(Locale.ENGLISH, "<= %.3f", fractionUnique) : fractionUnique + fieldInfo.hasValuesTrimmed() ? String.format("<= %d", uniqueCount) : uniqueCount )); if (calculateNumericStats) { values.addAll(Arrays.asList( diff --git a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-csv.xlsx b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-csv.xlsx index b8d0d441..e169dba7 100644 Binary files a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-csv.xlsx and b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-csv.xlsx differ diff --git a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sas.xlsx b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sas.xlsx index 72999e7f..19aa3ed9 100644 Binary files a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sas.xlsx and b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sas.xlsx differ diff --git a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sql.xlsx b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sql.xlsx index ea091dfe..8b212b22 100644 Binary files a/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sql.xlsx and b/whiterabbit/src/test/resources/scan_data/ScanReport-reference-v0.10.7-sql.xlsx differ