Skip to content
This repository was archived by the owner on Dec 19, 2022. It is now read-only.

Commit c4ed5e2

Browse files
author
Sylvain Bertrand
committed
Merge branch 'release/0.6.0'
2 parents d8cde31 + 2d17913 commit c4ed5e2

File tree

574 files changed

+301655
-3832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

574 files changed

+301655
-3832
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/build
1414

1515
# directories to always ignore
16+
**/build
1617
**/.gradle
1718
**/.project
1819
**/.classpath

Diff for: build.gradle

+24-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ apply plugin: 'maven-publish'
1313
apply plugin: 'com.jfrog.bintray'
1414

1515
sourceCompatibility = 1.8
16-
version = '0.5.1'
16+
version = '0.6.0'
17+
group = "us.ihmc"
1718

1819
project.ext.fullVersion = version
1920
project.ext.vcsUrl = "https://github.com/ihmcrobotics/euclid-core"
@@ -47,14 +48,35 @@ task testJar(type: Jar, dependsOn: [classes, testClasses]) {
4748
from sourceSets.test.output
4849
}
4950

51+
// Task to generate javadocs into relevant website directory
52+
task genJavadocs(type: Javadoc, dependsOn: sourceJar) {
53+
source = sourceSets.main.allJava
54+
classpath = configurations.compile
55+
destinationDir = file('websitedocs/website/static/javadocs')
56+
setFailOnError(false)
57+
}
58+
59+
//Ensure the replacestyles.sh script is run before the following task:
60+
61+
// Task to rename the javadocs directory with the version number
62+
task javadocsVersion (dependsOn: genJavadocs) {
63+
file('websitedocs/website/static/javadocs').renameTo(file('websitedocs/website/static/javadocs' + '-' + version))
64+
}
65+
66+
//Task to create a new version in docusaurus
67+
task docsVersion (type: Exec, dependsOn: javadocsVersion) {
68+
workingDir 'websitedocs/website'
69+
commandLine 'yarn', 'run', 'version', version
70+
}
71+
5072
publishing {
5173
publications {
5274
mavenJava(MavenPublication) {
5375
groupId "us.ihmc"
5476
artifactId project.ext.publicationName
5577
version "$version"
5678
from components.java
57-
79+
5880
pom.withXml {
5981
asNode().children().last() + {
6082
resolveStrategy = Closure.DELEGATE_FIRST

Diff for: gradle.properties

Whitespace-only changes.

Diff for: settings.gradle

Whitespace-only changes.

Diff for: src/us/ihmc/euclid/axisAngle/interfaces/AxisAngleBasics.java

-29
Original file line numberDiff line numberDiff line change
@@ -93,42 +93,13 @@ default void negate()
9393
set(-getX(), -getY(), -getZ(), -getAngle());
9494
}
9595

96-
/**
97-
* Sets this axis-angle to its inverse.
98-
*
99-
* @deprecated Use {@link #invert()} instead.
100-
*/
101-
@Deprecated
102-
default void inverse()
103-
{
104-
invert();
105-
}
106-
10796
/** {@inheritDoc} */
10897
@Override
10998
default void invert()
11099
{
111100
setAngle(-getAngle());
112101
}
113102

114-
/**
115-
* Normalizes the axis of this axis-angle such that its norm is equal to 1 after calling this
116-
* method and its direction remains unchanged.
117-
* <p>
118-
* Edge cases:
119-
* <ul>
120-
* <li>if this axis-angle contains {@link Double#NaN}, this method is ineffective.
121-
* </ul>
122-
* </p>
123-
*
124-
* @deprecated Use {@link #normalize()} instead
125-
*/
126-
@Deprecated
127-
default void normalizeAxis()
128-
{
129-
normalize();
130-
}
131-
132103
/**
133104
* Normalizes the axis of this axis-angle such that its norm is equal to 1 after calling this
134105
* method and its direction remains unchanged.

Diff for: src/us/ihmc/euclid/axisAngle/interfaces/AxisAngleReadOnly.java

+3-38
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package us.ihmc.euclid.axisAngle.interfaces;
22

3-
import us.ihmc.euclid.exceptions.NotAMatrix2DException;
4-
import us.ihmc.euclid.matrix.Matrix3D;
53
import us.ihmc.euclid.matrix.RotationMatrix;
4+
import us.ihmc.euclid.matrix.interfaces.Matrix3DBasics;
65
import us.ihmc.euclid.matrix.interfaces.Matrix3DReadOnly;
76
import us.ihmc.euclid.orientation.interfaces.Orientation3DReadOnly;
87
import us.ihmc.euclid.rotationConversion.RotationVectorConversion;
@@ -132,40 +131,6 @@ default boolean isAxisUnitary(double epsilon)
132131
return Math.abs(1.0 - axisNorm()) < epsilon;
133132
}
134133

135-
/**
136-
* Tests if this axis-angle represents a rotation around the z-axis.
137-
* <p>
138-
* This is commonly used to test if the axis-angle can be used to transform 2D geometry object.
139-
* </p>
140-
*
141-
* @param epsilon the tolerance to use.
142-
* @return {@code true} if this axis-angle represents a rotation around the z-axis, {@code false}
143-
* otherwise.
144-
* @deprecated Use {@link #isOrientation2D(double)} instead
145-
*/
146-
@Deprecated
147-
default boolean isZOnly(double epsilon)
148-
{
149-
return isOrientation2D(epsilon);
150-
}
151-
152-
/**
153-
* Asserts that this axis-angle represents a rotation around the z-axis.
154-
* <p>
155-
* This is commonly used to test if the axis-angle can be used to transform 2D geometry object.
156-
* </p>
157-
*
158-
* @param epsilon the tolerance to use.
159-
* @throws NotAMatrix2DException if this axis-angle does not represent a rotation around the
160-
* z-axis.
161-
* @deprecated Use {@link #checkIfOrientation2D(double)} instead
162-
*/
163-
@Deprecated
164-
default void checkIfIsZOnly(double epsilon)
165-
{
166-
checkIfOrientation2D(epsilon);
167-
}
168-
169134
/**
170135
* {@inheritDoc}
171136
* <p>
@@ -389,7 +354,7 @@ default void transform(Tuple2DReadOnly tupleOriginal, Tuple2DBasics tupleTransfo
389354

390355
/** {@inheritDoc} */
391356
@Override
392-
default void transform(Matrix3DReadOnly matrixOriginal, Matrix3D matrixTransformed)
357+
default void transform(Matrix3DReadOnly matrixOriginal, Matrix3DBasics matrixTransformed)
393358
{
394359
AxisAngleTools.transform(this, matrixOriginal, matrixTransformed);
395360
}
@@ -424,7 +389,7 @@ default void inverseTransform(Vector4DReadOnly vectorOriginal, Vector4DBasics ve
424389

425390
/** {@inheritDoc} */
426391
@Override
427-
default void inverseTransform(Matrix3DReadOnly matrixOriginal, Matrix3D matrixTransformed)
392+
default void inverseTransform(Matrix3DReadOnly matrixOriginal, Matrix3DBasics matrixTransformed)
428393
{
429394
AxisAngleTools.inverseTransform(this, matrixOriginal, matrixTransformed);
430395
}

0 commit comments

Comments
 (0)