Skip to content

Commit

Permalink
chore: fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
samypr100 committed Jun 26, 2024
1 parent 7e006f3 commit 5615ea9
Show file tree
Hide file tree
Showing 100 changed files with 1,404 additions and 1,145 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/clust4j/GlobalState.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*******************************************************************************/
package com.clust4j;

import org.apache.commons.math3.util.FastMath;

import java.util.Random;
import java.util.concurrent.ForkJoinPool;

import org.apache.commons.math3.util.FastMath;

/**
* A set of global config values used in multiple classes. Some values may
* be set to the user's preference, while others are final.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
*******************************************************************************/
package com.clust4j.algo;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.metrics.scoring.SupervisedMetric;
import org.apache.commons.math3.linear.RealMatrix;

import static com.clust4j.metrics.scoring.UnsupervisedMetric.SILHOUETTE;

Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/clust4j/algo/AbstractCentroidClusterer.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;

import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import com.clust4j.NamedEntity;
import com.clust4j.kernel.Kernel;
import com.clust4j.log.LogTimer;
Expand All @@ -31,6 +23,13 @@
import com.clust4j.metrics.scoring.SupervisedMetric;
import com.clust4j.utils.MatUtils;
import com.clust4j.utils.VecUtils;
import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;

import static com.clust4j.metrics.scoring.UnsupervisedMetric.SILHOUETTE;

Expand Down
19 changes: 9 additions & 10 deletions src/main/java/com/clust4j/algo/AbstractClusterer.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@

package com.clust4j.algo;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Random;
import java.util.UUID;

import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import com.clust4j.GlobalState;
import com.clust4j.NamedEntity;
import com.clust4j.except.ModelNotFitException;
Expand All @@ -41,6 +31,15 @@
import com.clust4j.utils.MatUtils;
import com.clust4j.utils.TableFormatter.Table;
import com.clust4j.utils.VecUtils;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Random;
import java.util.UUID;

/**
* The highest level of cluster abstraction in clust4j, AbstractClusterer
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/clust4j/algo/AbstractDensityClusterer.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
*******************************************************************************/
package com.clust4j.algo;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.metrics.pairwise.SimilarityMetric;
import org.apache.commons.math3.linear.RealMatrix;

public abstract class AbstractDensityClusterer extends AbstractAutonomousClusterer {
/**
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/clust4j/algo/AffinityPropagation.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;

import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import com.clust4j.GlobalState;
import com.clust4j.except.ModelNotFitException;
import com.clust4j.log.LogTimer;
import com.clust4j.log.Log.Tag.Algo;
import com.clust4j.log.LogTimer;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import com.clust4j.utils.MatUtils;
import com.clust4j.utils.VecUtils;
import com.clust4j.utils.MatUtils.Axis;
import com.clust4j.utils.VecUtils;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Random;

/**
* <a href="https://en.wikipedia.org/wiki/Affinity_propagation">Affinity Propagation</a> (AP)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@

package com.clust4j.algo;

import java.util.Random;

import com.clust4j.metrics.pairwise.GeometricallySeparable;
import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.metrics.pairwise.GeometricallySeparable;
import java.util.Random;

/**
* A model setup class for {@link AffinityPropagation}. This class houses all
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/clust4j/algo/BallTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.HashSet;

import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.util.FastMath;

import com.clust4j.log.Loggable;
import com.clust4j.metrics.pairwise.Distance;
import com.clust4j.metrics.pairwise.DistanceMetric;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import com.clust4j.metrics.pairwise.MinkowskiDistance;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;

import java.util.HashSet;

/**
* In computer science, a ball tree, balltree or metric tree,
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/clust4j/algo/BaseClassifier.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*******************************************************************************/
package com.clust4j.algo;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.metrics.scoring.SupervisedMetric;
import com.clust4j.metrics.scoring.UnsupervisedMetric;
import org.apache.commons.math3.linear.RealMatrix;

import static com.clust4j.metrics.scoring.UnsupervisedMetric.SILHOUETTE;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/clust4j/algo/BaseClustererParameters.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package com.clust4j.algo;

import java.util.Random;

import com.clust4j.Clust4j;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import com.clust4j.utils.DeepCloneable;

import java.util.Random;

/**
* Base planner class many clustering algorithms
* will extend with static inner classes. Some clustering
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/clust4j/algo/BaseModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*******************************************************************************/
package com.clust4j.algo;

import java.text.NumberFormat;

import com.clust4j.Clust4j;
import com.clust4j.utils.SynchronicityLock;
import com.clust4j.utils.TableFormatter;

import java.text.NumberFormat;

abstract public class BaseModel extends Clust4j implements java.io.Serializable {
private static final long serialVersionUID = 4707757741169405063L;
public final static TableFormatter formatter;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/clust4j/algo/BaseNeighborsModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
*******************************************************************************/
package com.clust4j.algo;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.GlobalState;
import com.clust4j.algo.Neighborhood;
import com.clust4j.except.ModelNotFitException;
import com.clust4j.metrics.pairwise.DistanceMetric;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import org.apache.commons.math3.linear.RealMatrix;

abstract public class BaseNeighborsModel extends AbstractClusterer {
private static final long serialVersionUID = 1054047329248586585L;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/clust4j/algo/BoruvkaAlgorithm.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@
*******************************************************************************/
package com.clust4j.algo;

import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.util.FastMath;

import com.clust4j.algo.Neighborhood;
import com.clust4j.algo.NearestNeighborHeapSearch.NodeData;
import com.clust4j.log.LogTimer;
import com.clust4j.log.Loggable;
import com.clust4j.metrics.pairwise.DistanceMetric;
import com.clust4j.metrics.pairwise.Pairwise;
import com.clust4j.utils.VecUtils;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.util.FastMath;

/**
* A graph traversal algorithm used in identifying the minimum spanning tree
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

package com.clust4j.algo;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.algo.AbstractCentroidClusterer.InitializationStrategy;
import org.apache.commons.math3.linear.RealMatrix;

public abstract class CentroidClustererParameters<T extends AbstractCentroidClusterer> extends BaseClustererParameters
implements UnsupervisedClassifierParameters<T>, ConvergeablePlanner {
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/clust4j/algo/CentroidLearner.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.ArrayList;
import java.util.Collection;

import org.apache.commons.math3.linear.RealMatrix;
import com.clust4j.except.ModelNotFitException;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.except.ModelNotFitException;
import java.util.ArrayList;
import java.util.Collection;

public interface CentroidLearner extends java.io.Serializable {
/**
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/com/clust4j/algo/DBSCAN.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Stack;

import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.algo.RadiusNeighborsParameters;
import com.clust4j.log.LogTimer;
import com.clust4j.log.Log.Tag.Algo;
import com.clust4j.log.LogTimer;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import com.clust4j.metrics.pairwise.SimilarityMetric;
import com.clust4j.utils.MatUtils;
import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Stack;


/**
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/clust4j/algo/DBSCANParameters.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@

package com.clust4j.algo;

import java.util.Random;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.algo.AbstractDBSCAN.AbstractDBSCANParameters;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import org.apache.commons.math3.linear.RealMatrix;

import java.util.Random;

/**
* A builder class to provide an easier constructing
Expand Down
36 changes: 17 additions & 19 deletions src/main/java/com/clust4j/algo/HDBSCAN.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,35 @@
*******************************************************************************/
package com.clust4j.algo;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;

import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.Precision;

import com.clust4j.GlobalState;
import com.clust4j.utils.QuadTup;
import com.clust4j.algo.Neighborhood;
import com.clust4j.log.Log.Tag.Algo;
import com.clust4j.log.LogTimer;
import com.clust4j.log.Loggable;
import com.clust4j.log.Log.Tag.Algo;
import com.clust4j.metrics.pairwise.Distance;
import com.clust4j.metrics.pairwise.DistanceMetric;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import com.clust4j.metrics.pairwise.Pairwise;
import com.clust4j.utils.EntryPair;
import com.clust4j.utils.Series.Inequality;
import com.clust4j.utils.MatUtils;
import com.clust4j.utils.MatUtils.MatSeries;
import com.clust4j.utils.QuadTup;
import com.clust4j.utils.Series.Inequality;
import com.clust4j.utils.VecUtils;
import com.clust4j.utils.VecUtils.DoubleSeries;
import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.linear.RealMatrix;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.Precision;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;

/**
* Hierarchical Density-Based Spatial Clustering of Applications with Noise.
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/clust4j/algo/HDBSCANParameters.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@

package com.clust4j.algo;

import java.util.Random;

import org.apache.commons.math3.linear.RealMatrix;

import com.clust4j.algo.AbstractDBSCAN.AbstractDBSCANParameters;
import com.clust4j.algo.HDBSCAN.HDBSCAN_Algorithm;
import com.clust4j.metrics.pairwise.GeometricallySeparable;
import org.apache.commons.math3.linear.RealMatrix;

import java.util.Random;

/**
* A builder class to provide an easier constructing
Expand Down
Loading

0 comments on commit 5615ea9

Please sign in to comment.