Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MATH-1284: Replace uses of Vector3D in user guide with Cartesian2D.

This commit is contained in:
Ray DeCampo 2017-05-04 07:27:37 -04:00
parent c7d20472de
commit e508ad09d7
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java
View File

@ -20,7 +20,7 @@ package org.apache.commons.math4.userguide.sofm;
import org.apache.commons.rng.UniformRandomProvider; import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.rng.simple.RandomSource;
import org.apache.commons.math4.geometry.euclidean.threed.Vector3D; import org.apache.commons.math4.geometry.euclidean.threed.Cartesian3D;
import org.apache.commons.math4.geometry.euclidean.threed.Rotation; import org.apache.commons.math4.geometry.euclidean.threed.Rotation;
import org.apache.commons.math4.random.UnitSphereRandomVectorGenerator; import org.apache.commons.math4.random.UnitSphereRandomVectorGenerator;
import org.apache.commons.math4.distribution.RealDistribution; import org.apache.commons.math4.distribution.RealDistribution;
@ -32,7 +32,7 @@ import org.apache.commons.math4.distribution.UniformRealDistribution;
*/ */
public class ChineseRings { public class ChineseRings {
/** Points in the two rings. */ /** Points in the two rings. */
private final Vector3D[] points; private final Cartesian3D[] points;
/** /**
* @param orientationRing1 Vector othogonal to the plane containing the * @param orientationRing1 Vector othogonal to the plane containing the
@ -44,7 +44,7 @@ public class ChineseRings {
* @param numPointsRing1 Number of points in the first ring. * @param numPointsRing1 Number of points in the first ring.
* @param numPointsRing2 Number of points in the second ring. * @param numPointsRing2 Number of points in the second ring.
*/ */
public ChineseRings(Vector3D orientationRing1, public ChineseRings(Cartesian3D orientationRing1,
double radiusRing1, double radiusRing1,
double halfWidthRing1, double halfWidthRing1,
double radiusRing2, double radiusRing2,
@ -52,9 +52,9 @@ public class ChineseRings {
int numPointsRing1, int numPointsRing1,
int numPointsRing2) { int numPointsRing2) {
// First ring (centered at the origin). // First ring (centered at the origin).
final Vector3D[] firstRing = new Vector3D[numPointsRing1]; final Cartesian3D[] firstRing = new Cartesian3D[numPointsRing1];
// Second ring (centered around the first ring). // Second ring (centered around the first ring).
final Vector3D[] secondRing = new Vector3D[numPointsRing2]; final Cartesian3D[] secondRing = new Cartesian3D[numPointsRing2];
// Create two rings lying in xy-plane. // Create two rings lying in xy-plane.
final UnitSphereRandomVectorGenerator unit final UnitSphereRandomVectorGenerator unit
@ -72,7 +72,7 @@ public class ChineseRings {
final double[] v = unit.nextVector(); final double[] v = unit.nextVector();
final double r = radius1.sample(); final double r = radius1.sample();
// First ring is in the xy-plane, centered at (0, 0, 0). // First ring is in the xy-plane, centered at (0, 0, 0).
firstRing[i] = new Vector3D(v[0] * r, firstRing[i] = new Cartesian3D(v[0] * r,
v[1] * r, v[1] * r,
widthRing1.sample()); widthRing1.sample());
} }
@ -87,16 +87,16 @@ public class ChineseRings {
final double[] v = unit.nextVector(); final double[] v = unit.nextVector();
final double r = radius2.sample(); final double r = radius2.sample();
// Second ring is in the xz-plane, centered at (radiusRing1, 0, 0). // Second ring is in the xz-plane, centered at (radiusRing1, 0, 0).
secondRing[i] = new Vector3D(radiusRing1 + v[0] * r, secondRing[i] = new Cartesian3D(radiusRing1 + v[0] * r,
widthRing2.sample(), widthRing2.sample(),
v[1] * r); v[1] * r);
} }
// Move first and second rings into position. // Move first and second rings into position.
final Rotation rot = new Rotation(Vector3D.PLUS_K, final Rotation rot = new Rotation(Cartesian3D.PLUS_K,
orientationRing1.normalize()); orientationRing1.normalize());
int count = 0; int count = 0;
points = new Vector3D[numPointsRing1 + numPointsRing2]; points = new Cartesian3D[numPointsRing1 + numPointsRing2];
for (int i = 0; i < numPointsRing1; i++) { for (int i = 0; i < numPointsRing1; i++) {
points[count++] = rot.applyTo(firstRing[i]); points[count++] = rot.applyTo(firstRing[i]);
} }
@ -108,7 +108,7 @@ public class ChineseRings {
/** /**
* Gets all the points. * Gets all the points.
*/ */
public Vector3D[] getPoints() { public Cartesian3D[] getPoints() {
return points.clone(); return points.clone();
} }
} }

10
src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java
View File

@ -38,7 +38,7 @@ import org.apache.commons.math4.ml.neuralnet.sofm.KohonenTrainingTask;
import org.apache.commons.math4.ml.distance.DistanceMeasure; import org.apache.commons.math4.ml.distance.DistanceMeasure;
import org.apache.commons.math4.ml.distance.EuclideanDistance; import org.apache.commons.math4.ml.distance.EuclideanDistance;
import org.apache.commons.math4.stat.descriptive.SummaryStatistics; import org.apache.commons.math4.stat.descriptive.SummaryStatistics;
import org.apache.commons.math4.geometry.euclidean.threed.Vector3D; import org.apache.commons.math4.geometry.euclidean.threed.Cartesian3D;
import org.apache.commons.math4.util.FastMath; import org.apache.commons.math4.util.FastMath;
import org.apache.commons.math4.exception.MathUnsupportedOperationException; import org.apache.commons.math4.exception.MathUnsupportedOperationException;
@ -61,7 +61,7 @@ public class ChineseRingsClassifier {
private final DistanceMeasure distance = new EuclideanDistance(); private final DistanceMeasure distance = new EuclideanDistance();
public static void main(String[] args) { public static void main(String[] args) {
final ChineseRings rings = new ChineseRings(new Vector3D(1, 2, 3), final ChineseRings rings = new ChineseRings(new Cartesian3D(1, 2, 3),
25, 2, 25, 2,
20, 1, 20, 1,
2000, 1500); 2000, 1500);
@ -185,7 +185,7 @@ public class ChineseRingsClassifier {
new SummaryStatistics(), new SummaryStatistics(),
new SummaryStatistics() new SummaryStatistics()
}; };
for (Vector3D p : rings.getPoints()) { for (Cartesian3D p : rings.getPoints()) {
centre[0].addValue(p.getX()); centre[0].addValue(p.getX());
centre[1].addValue(p.getY()); centre[1].addValue(p.getY());
centre[2].addValue(p.getZ()); centre[2].addValue(p.getZ());
@ -220,7 +220,7 @@ public class ChineseRingsClassifier {
public Iterator<double[]> iterator() { public Iterator<double[]> iterator() {
return new Iterator<double[]>() { return new Iterator<double[]>() {
/** Data. */ /** Data. */
final Vector3D[] points = rings.getPoints(); final Cartesian3D[] points = rings.getPoints();
/** Number of samples. */ /** Number of samples. */
private int n = 0; private int n = 0;
@ -253,7 +253,7 @@ public class ChineseRingsClassifier {
private Iterator<double[]> createRandomIterator(final long numSamples) { private Iterator<double[]> createRandomIterator(final long numSamples) {
return new Iterator<double[]>() { return new Iterator<double[]>() {
/** Data. */ /** Data. */
final Vector3D[] points = rings.getPoints(); final Cartesian3D[] points = rings.getPoints();
/** RNG. */ /** RNG. */
final UniformRandomProvider rng = RandomSource.create(RandomSource.KISS); final UniformRandomProvider rng = RandomSource.create(RandomSource.KISS);
/** Number of samples. */ /** Number of samples. */