Skip to content

Commit

Permalink
a6.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mararsh
Mararsh committed Apr 11, 2024
1 parent b2e9f83 commit 277dd4a
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 15 deletions.
7 changes: 3 additions & 4 deletions alpha/MyBox/src/main/java/mara/mybox/calculation/DoubleStatistic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,12 @@ private void calculateBase() {
double v = doubles[i];
if (Double.isNaN(v)) {
switch (invalidAs) {
case Empty:
case Skip:
invalidCount++;
continue;
case Zero:
v = 0;
break;
default:
invalidCount++;
continue;
}
}
count++;
Expand Down
43 changes: 35 additions & 8 deletions alpha/MyBox/src/main/java/mara/mybox/calculation/Normalization.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package mara.mybox.calculation;

import mara.mybox.db.data.ColumnDefinition.InvalidAs;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Empty;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Keep;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Null;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Skip;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Zero;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.tools.DoubleTools;
import mara.mybox.tools.StringTools;
Expand Down Expand Up @@ -124,8 +129,7 @@ public boolean minMax() {
case Zero:
d = 0;
break;
case Skip:
case Empty:
default:
continue;
}
}
Expand Down Expand Up @@ -153,12 +157,18 @@ public boolean minMax() {
case Zero:
resultVector[i] = "0";
break;
case Skip:
case Keep:
resultVector[i] = s;
break;
case Skip:
resultVector[i] = null;
break;
case Empty:
resultVector[i] = "";
break;
case Null:
resultVector[i] = null;
break;
}
continue;
}
Expand Down Expand Up @@ -198,8 +208,7 @@ public boolean zscore() {
case Zero:
d = 0;
break;
case Skip:
case Empty:
default:
continue;
}
}
Expand All @@ -219,12 +228,18 @@ public boolean zscore() {
case Zero:
resultVector[i] = "0";
break;
case Skip:
case Keep:
resultVector[i] = s;
break;
case Skip:
resultVector[i] = null;
break;
case Empty:
resultVector[i] = "";
break;
case Null:
resultVector[i] = null;
break;
}
continue;
}
Expand Down Expand Up @@ -267,12 +282,18 @@ public boolean sum() {
case Zero:
resultVector[i] = "0";
break;
case Skip:
case Keep:
resultVector[i] = s;
break;
case Skip:
resultVector[i] = null;
break;
case Empty:
resultVector[i] = "";
break;
case Null:
resultVector[i] = null;
break;
}
continue;
}
Expand Down Expand Up @@ -315,12 +336,18 @@ public boolean absoluate() {
case Zero:
resultVector[i] = "0";
break;
case Skip:
case Keep:
resultVector[i] = s;
break;
case Skip:
resultVector[i] = null;
break;
case Empty:
resultVector[i] = "";
break;
case Null:
resultVector[i] = null;
break;
}
continue;
}
Expand Down
8 changes: 7 additions & 1 deletion alpha/MyBox/src/main/java/mara/mybox/controller/Data2DNormalizeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import javafx.fxml.FXML;
import mara.mybox.calculation.Normalization;
import mara.mybox.data2d.writer.Data2DWriter;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Empty;
import mara.mybox.dev.MyBoxLog;
import mara.mybox.fxml.FxTask;
import mara.mybox.fxml.WindowTools;
Expand Down Expand Up @@ -71,11 +72,16 @@ public boolean handleRows() {
row.add("0");
break;
case Skip:
row.add(s);
break;
case Empty:
row.add("");
break;
case Null:
row.add(null);
break;
default:
row.add(s);
break;
}
} else {
row.add(NumberTools.format(d, scale));
Expand Down
5 changes: 5 additions & 0 deletions alpha/MyBox/src/main/java/mara/mybox/data/SetValue.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mara.mybox.data;

import mara.mybox.db.data.ColumnDefinition.InvalidAs;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Empty;
import mara.mybox.tools.DoubleTools;

/**
Expand Down Expand Up @@ -115,6 +116,10 @@ public String scale(String value) {
return "0";
case Empty:
return "";
case Null:
return null;
case Skip:
return null;
default:
return value;
}
Expand Down
43 changes: 41 additions & 2 deletions alpha/MyBox/src/main/java/mara/mybox/data2d/operate/Data2DNormalize.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import mara.mybox.calculation.DoubleStatistic;
import mara.mybox.calculation.Normalization;
import mara.mybox.data2d.Data2D_Edit;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Null;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Skip;
import static mara.mybox.db.data.ColumnDefinition.InvalidAs.Zero;
import mara.mybox.tools.DoubleTools;
import mara.mybox.value.AppValues;
import static mara.mybox.value.Languages.message;
Expand Down Expand Up @@ -114,6 +117,11 @@ public boolean handleNormalizeMinMaxColumns() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -164,6 +172,11 @@ public boolean handleNormalizeSumColumns() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -214,6 +227,11 @@ public boolean handleNormalizeZscoreColumns() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -268,6 +286,11 @@ public boolean handleNormalizeMinMaxAll() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -318,6 +341,11 @@ public boolean handleNormalizeSumAll() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -368,6 +396,11 @@ public boolean handleNormalizeZscoreAll() {
case Zero:
targetRow.add("0");
break;
case Skip:
break;
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;
Expand Down Expand Up @@ -430,12 +463,18 @@ public boolean handleNormalizeRows(Normalization.Algorithm a) {
case Zero:
targetRow.add("0");
break;
case Empty:
targetRow.add("");
break;
case Skip:
targetRow.add(s);
break;
case Empty:
case Null:
targetRow.add(null);
break;
default:
targetRow.add(s);
break;

}
} else {
targetRow.add(DoubleTools.scale(d, scale) + "");
Expand Down

0 comments on commit 277dd4a

Please sign in to comment.