From d31b31799ee6a2e3d1fcf057e8faf6f0d90e3db1 Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Sun, 5 Feb 2023 22:01:22 -0500 Subject: [PATCH 1/9] Removing readObject and writeObject methods. --- .../classification/ImmutableLabelInfo.java | 6 -- .../org/tribuo/classification/LabelInfo.java | 7 --- .../dtree/impl/ClassifierTrainingNode.java | 4 -- .../sgd/linear/LinearSGDModel.java | 10 ---- .../clustering/hdbscan/HdbscanModel.java | 17 +----- .../tribuo/clustering/kmeans/KMeansModel.java | 18 +----- .../org/tribuo/common/nearest/KNNModel.java | 24 +------- .../tribuo/common/sgd/AbstractSGDModel.java | 3 +- .../common/xgboost/XGBoostExternalModel.java | 28 +--------- .../tribuo/common/xgboost/XGBoostModel.java | 55 +------------------ .../main/java/org/tribuo/CategoricalInfo.java | 13 +---- .../java/org/tribuo/hash/HashCodeHasher.java | 9 +-- .../org/tribuo/hash/MessageDigestHasher.java | 15 +---- .../org/tribuo/hash/ModHashCodeHasher.java | 9 +-- .../org/tribuo/test/MockMultiOutputInfo.java | 11 +--- .../java/org/tribuo/interop/oci/OCIModel.java | 24 ++------ .../interop/onnx/ONNXExternalModel.java | 19 ++----- .../tensorflow/TensorFlowCheckpointModel.java | 28 +--------- .../TensorFlowFrozenExternalModel.java | 21 +------ .../tensorflow/TensorFlowNativeModel.java | 27 +-------- .../TensorFlowSavedModelExternalModel.java | 13 +---- .../sequence/TensorFlowSequenceModel.java | 23 +------- .../multilabel/ImmutableMultiLabelInfo.java | 7 +-- .../org/tribuo/multilabel/MultiLabelInfo.java | 10 +--- .../regression/ImmutableRegressionInfo.java | 15 ++--- .../liblinear/LibLinearRegressionModel.java | 25 ++------- .../libsvm/LibSVMRegressionModel.java | 31 +---------- .../impl/JointRegressorTrainingNode.java | 4 -- .../rtree/impl/RegressorTrainingNode.java | 4 -- .../regression/sgd/linear/LinearSGDModel.java | 10 ---- .../regression/slm/SparseLinearModel.java | 39 +------------ .../util/tokens/TokenizerTestWrapper.java | 12 ---- 32 files changed, 58 insertions(+), 483 deletions(-) diff --git a/Classification/Core/src/main/java/org/tribuo/classification/ImmutableLabelInfo.java b/Classification/Core/src/main/java/org/tribuo/classification/ImmutableLabelInfo.java index daa1e463b..06f52ecab 100644 --- a/Classification/Core/src/main/java/org/tribuo/classification/ImmutableLabelInfo.java +++ b/Classification/Core/src/main/java/org/tribuo/classification/ImmutableLabelInfo.java @@ -303,10 +303,4 @@ public Pair next() { return new Pair<>(e.getKey(),new Label(e.getValue())); } } - - private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - - domain = Collections.unmodifiableSet(new HashSet<>(labels.values())); - } } diff --git a/Classification/Core/src/main/java/org/tribuo/classification/LabelInfo.java b/Classification/Core/src/main/java/org/tribuo/classification/LabelInfo.java index c309ab786..99aff632a 100644 --- a/Classification/Core/src/main/java/org/tribuo/classification/LabelInfo.java +++ b/Classification/Core/src/main/java/org/tribuo/classification/LabelInfo.java @@ -176,11 +176,4 @@ public MutableOutputInfo