From bcba26538685e9ed51334539be0c3218063718d9 Mon Sep 17 00:00:00 2001
From: tomfisher <tom.x.fisher@gmail.com>
Date: Wed, 4 Feb 2015 16:11:57 +0800
Subject: [PATCH 1/2] Fix the wrong path calculation of Arc with small angle

---
 src/main/java/pythagoras/d/AbstractArc.java | 2 +-
 src/main/java/pythagoras/f/AbstractArc.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pythagoras/d/AbstractArc.java b/src/main/java/pythagoras/d/AbstractArc.java
index 509414e..b0ba3d3 100644
--- a/src/main/java/pythagoras/d/AbstractArc.java
+++ b/src/main/java/pythagoras/d/AbstractArc.java
@@ -283,7 +283,7 @@ public abstract class AbstractArc extends RectangularShape implements IArc
                     k = -k;
                 }
             } else {
-                arcCount = (int)Math.rint(Math.abs(extent) / 90f);
+                arcCount = MathUtil.iceil(Math.abs(extent) / 90f);
                 step = Math.toRadians(extent / arcCount);
                 k = 4f / 3f * (1f - Math.cos(step / 2f)) / Math.sin(step / 2f);
             }
diff --git a/src/main/java/pythagoras/f/AbstractArc.java b/src/main/java/pythagoras/f/AbstractArc.java
index b8dbd2d..e1551e8 100644
--- a/src/main/java/pythagoras/f/AbstractArc.java
+++ b/src/main/java/pythagoras/f/AbstractArc.java
@@ -283,7 +283,7 @@ public abstract class AbstractArc extends RectangularShape implements IArc
                     k = -k;
                 }
             } else {
-                arcCount = (int)Math.rint(Math.abs(extent) / 90f);
+                arcCount = MathUtil.iceil(Math.abs(extent) / 90f);
                 step = FloatMath.toRadians(extent / arcCount);
                 k = 4f / 3f * (1f - FloatMath.cos(step / 2f)) / FloatMath.sin(step / 2f);
             }

From 85f702c93ff732987c43aaf0a02767f3364f5ad1 Mon Sep 17 00:00:00 2001
From: tomfisher <tom.x.fisher@gmail.com>
Date: Wed, 4 Feb 2015 16:25:33 +0800
Subject: [PATCH 2/2] Clean up the serialVersionUID warning

---
 src/main/java/pythagoras/d/Arc.java                           | 4 +++-
 src/main/java/pythagoras/d/Box.java                           | 4 +++-
 src/main/java/pythagoras/d/Circle.java                        | 4 +++-
 src/main/java/pythagoras/d/CubicCurve.java                    | 4 +++-
 src/main/java/pythagoras/d/Dimension.java                     | 4 +++-
 src/main/java/pythagoras/d/Ellipse.java                       | 4 +++-
 src/main/java/pythagoras/d/IllegalPathStateException.java     | 4 +++-
 src/main/java/pythagoras/d/Line.java                          | 4 +++-
 src/main/java/pythagoras/d/Matrix3.java                       | 4 +++-
 src/main/java/pythagoras/d/Matrix4.java                       | 4 +++-
 src/main/java/pythagoras/d/Plane.java                         | 4 +++-
 src/main/java/pythagoras/d/Point.java                         | 4 +++-
 src/main/java/pythagoras/d/QuadCurve.java                     | 4 +++-
 src/main/java/pythagoras/d/Quaternion.java                    | 4 +++-
 src/main/java/pythagoras/d/Rectangle.java                     | 4 +++-
 src/main/java/pythagoras/d/RoundRectangle.java                | 4 +++-
 src/main/java/pythagoras/d/Vector3.java                       | 4 +++-
 src/main/java/pythagoras/d/Vector4.java                       | 4 +++-
 src/main/java/pythagoras/f/Arc.java                           | 4 +++-
 src/main/java/pythagoras/f/Box.java                           | 4 +++-
 src/main/java/pythagoras/f/Circle.java                        | 4 +++-
 src/main/java/pythagoras/f/CubicCurve.java                    | 4 +++-
 src/main/java/pythagoras/f/Dimension.java                     | 4 +++-
 src/main/java/pythagoras/f/Ellipse.java                       | 4 +++-
 src/main/java/pythagoras/f/IllegalPathStateException.java     | 4 +++-
 src/main/java/pythagoras/f/Line.java                          | 4 +++-
 src/main/java/pythagoras/f/Matrix3.java                       | 4 +++-
 src/main/java/pythagoras/f/Matrix4.java                       | 4 +++-
 src/main/java/pythagoras/f/Plane.java                         | 4 +++-
 src/main/java/pythagoras/f/Point.java                         | 4 +++-
 src/main/java/pythagoras/f/QuadCurve.java                     | 4 +++-
 src/main/java/pythagoras/f/Quaternion.java                    | 4 +++-
 src/main/java/pythagoras/f/Rectangle.java                     | 4 +++-
 src/main/java/pythagoras/f/RoundRectangle.java                | 4 +++-
 src/main/java/pythagoras/f/Vector3.java                       | 4 +++-
 src/main/java/pythagoras/f/Vector4.java                       | 4 +++-
 src/main/java/pythagoras/i/Dimension.java                     | 4 +++-
 src/main/java/pythagoras/i/Point.java                         | 4 +++-
 src/main/java/pythagoras/i/Rectangle.java                     | 4 +++-
 .../java/pythagoras/util/NoninvertibleTransformException.java | 4 +++-
 src/main/java/pythagoras/util/SingularMatrixException.java    | 4 +++-
 41 files changed, 123 insertions(+), 41 deletions(-)

diff --git a/src/main/java/pythagoras/d/Arc.java b/src/main/java/pythagoras/d/Arc.java
index af5c639..1a7063d 100644
--- a/src/main/java/pythagoras/d/Arc.java
+++ b/src/main/java/pythagoras/d/Arc.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Arc extends AbstractArc implements Serializable
 {
-    /** The x-coordinate of this arc's framing rectangle. */
+	private static final long serialVersionUID = -2351063986218111710L;
+
+	/** The x-coordinate of this arc's framing rectangle. */
     public double x;
 
     /** The y-coordinate of this arc's framing rectangle. */
diff --git a/src/main/java/pythagoras/d/Box.java b/src/main/java/pythagoras/d/Box.java
index 10be3b6..73638bb 100644
--- a/src/main/java/pythagoras/d/Box.java
+++ b/src/main/java/pythagoras/d/Box.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Box implements IBox, Serializable
 {
-    /** The unit box. */
+	private static final long serialVersionUID = 5387466195433177670L;
+
+	/** The unit box. */
     public static final Box UNIT = new Box(Vector3.UNIT_XYZ.negate(), Vector3.UNIT_XYZ);
 
     /** The zero box. */
diff --git a/src/main/java/pythagoras/d/Circle.java b/src/main/java/pythagoras/d/Circle.java
index 0c19a4b..0996de0 100644
--- a/src/main/java/pythagoras/d/Circle.java
+++ b/src/main/java/pythagoras/d/Circle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Circle extends AbstractCircle implements Serializable
 {
-    /** The x-coordinate of the circle. */
+	private static final long serialVersionUID = -3344650739420164686L;
+
+	/** The x-coordinate of the circle. */
     public double x;
 
     /** The y-coordinate of the circle. */
diff --git a/src/main/java/pythagoras/d/CubicCurve.java b/src/main/java/pythagoras/d/CubicCurve.java
index ce004f0..095a392 100644
--- a/src/main/java/pythagoras/d/CubicCurve.java
+++ b/src/main/java/pythagoras/d/CubicCurve.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class CubicCurve extends AbstractCubicCurve implements Serializable
 {
-    /** The x-coordinate of the start of this curve. */
+	private static final long serialVersionUID = 1344542230356205271L;
+
+	/** The x-coordinate of the start of this curve. */
     public double x1;
 
     /** The y-coordinate of the start of this curve. */
diff --git a/src/main/java/pythagoras/d/Dimension.java b/src/main/java/pythagoras/d/Dimension.java
index dec6d6a..00869d7 100644
--- a/src/main/java/pythagoras/d/Dimension.java
+++ b/src/main/java/pythagoras/d/Dimension.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Dimension extends AbstractDimension implements Serializable
 {
-    /** The magnitude in the x-dimension. */
+	private static final long serialVersionUID = 6057102762997878357L;
+
+	/** The magnitude in the x-dimension. */
     public double width;
 
     /** The magnitude in the y-dimension. */
diff --git a/src/main/java/pythagoras/d/Ellipse.java b/src/main/java/pythagoras/d/Ellipse.java
index f9e9efe..22bf967 100644
--- a/src/main/java/pythagoras/d/Ellipse.java
+++ b/src/main/java/pythagoras/d/Ellipse.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Ellipse extends AbstractEllipse implements Serializable
 {
-    /** The x-coordinate of the framing rectangle. */
+	private static final long serialVersionUID = -2681903285662523175L;
+
+	/** The x-coordinate of the framing rectangle. */
     public double x;
 
     /** The y-coordinate of the framing rectangle. */
diff --git a/src/main/java/pythagoras/d/IllegalPathStateException.java b/src/main/java/pythagoras/d/IllegalPathStateException.java
index a094a5c..ec987bb 100644
--- a/src/main/java/pythagoras/d/IllegalPathStateException.java
+++ b/src/main/java/pythagoras/d/IllegalPathStateException.java
@@ -11,7 +11,9 @@ package pythagoras.d;
  */
 public class IllegalPathStateException extends RuntimeException
 {
-    public IllegalPathStateException () {
+	private static final long serialVersionUID = -1876236224736636005L;
+
+	public IllegalPathStateException () {
     }
 
     public IllegalPathStateException (String s) {
diff --git a/src/main/java/pythagoras/d/Line.java b/src/main/java/pythagoras/d/Line.java
index f98238d..3ebd833 100644
--- a/src/main/java/pythagoras/d/Line.java
+++ b/src/main/java/pythagoras/d/Line.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Line extends AbstractLine implements Serializable
 {
-    /** The x-coordinate of the start of this line segment. */
+	private static final long serialVersionUID = -9086971085479796688L;
+
+	/** The x-coordinate of the start of this line segment. */
     public double x1;
 
     /** The y-coordinate of the start of this line segment. */
diff --git a/src/main/java/pythagoras/d/Matrix3.java b/src/main/java/pythagoras/d/Matrix3.java
index d7ba7fe..57cb0ca 100644
--- a/src/main/java/pythagoras/d/Matrix3.java
+++ b/src/main/java/pythagoras/d/Matrix3.java
@@ -15,7 +15,9 @@ import pythagoras.util.SingularMatrixException;
  */
 public class Matrix3 implements IMatrix3, Serializable
 {
-    /** the identity matrix. */
+	private static final long serialVersionUID = -2923052760368784693L;
+
+	/** the identity matrix. */
     public static final Matrix3 IDENTITY = new Matrix3();
 
     /** The values of the matrix. The names take the form {@code mCOLROW}. */
diff --git a/src/main/java/pythagoras/d/Matrix4.java b/src/main/java/pythagoras/d/Matrix4.java
index 23f51c9..aa34016 100644
--- a/src/main/java/pythagoras/d/Matrix4.java
+++ b/src/main/java/pythagoras/d/Matrix4.java
@@ -15,7 +15,9 @@ import pythagoras.util.SingularMatrixException;
  */
 public final class Matrix4 implements IMatrix4, Serializable
 {
-    /** The identity matrix. */
+	private static final long serialVersionUID = 2376107607832772408L;
+
+	/** The identity matrix. */
     public static final IMatrix4 IDENTITY = new Matrix4();
 
     /** An empty matrix array. */
diff --git a/src/main/java/pythagoras/d/Plane.java b/src/main/java/pythagoras/d/Plane.java
index f56e6ac..6a9c1b1 100644
--- a/src/main/java/pythagoras/d/Plane.java
+++ b/src/main/java/pythagoras/d/Plane.java
@@ -15,7 +15,9 @@ import pythagoras.util.Platform;
  */
 public class Plane implements IPlane, Serializable
 {
-    /** The X/Y plane. */
+	private static final long serialVersionUID = 5309702666731799041L;
+
+	/** The X/Y plane. */
     public static final Plane XY_PLANE = new Plane(Vector3.UNIT_Z, 0f);
 
     /** The X/Z plane. */
diff --git a/src/main/java/pythagoras/d/Point.java b/src/main/java/pythagoras/d/Point.java
index a2456eb..fd92acd 100644
--- a/src/main/java/pythagoras/d/Point.java
+++ b/src/main/java/pythagoras/d/Point.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Point extends AbstractPoint implements Serializable
 {
-    /** The x-coordinate of the point. */
+	private static final long serialVersionUID = 4524700003415412445L;
+
+	/** The x-coordinate of the point. */
     public double x;
 
     /** The y-coordinate of the point. */
diff --git a/src/main/java/pythagoras/d/QuadCurve.java b/src/main/java/pythagoras/d/QuadCurve.java
index 98fe952..d16362c 100644
--- a/src/main/java/pythagoras/d/QuadCurve.java
+++ b/src/main/java/pythagoras/d/QuadCurve.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class QuadCurve extends AbstractQuadCurve implements Serializable
 {
-    /** The x-coordinate of the start of this curve. */
+	private static final long serialVersionUID = -7816504376651508296L;
+
+	/** The x-coordinate of the start of this curve. */
     public double x1;
 
     /** The y-coordinate of the start of this curve. */
diff --git a/src/main/java/pythagoras/d/Quaternion.java b/src/main/java/pythagoras/d/Quaternion.java
index 4593e63..50e6cbd 100644
--- a/src/main/java/pythagoras/d/Quaternion.java
+++ b/src/main/java/pythagoras/d/Quaternion.java
@@ -15,7 +15,9 @@ import pythagoras.util.Platform;
  */
 public class Quaternion implements IQuaternion, Serializable
 {
-    /** The identity quaternion. */
+	private static final long serialVersionUID = -2507768410601557773L;
+
+	/** The identity quaternion. */
     public static final IQuaternion IDENTITY = new Quaternion(0f, 0f, 0f, 1f);
 
     /** The components of the quaternion. */
diff --git a/src/main/java/pythagoras/d/Rectangle.java b/src/main/java/pythagoras/d/Rectangle.java
index 1398d98..9882cd6 100644
--- a/src/main/java/pythagoras/d/Rectangle.java
+++ b/src/main/java/pythagoras/d/Rectangle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Rectangle extends AbstractRectangle implements Serializable
 {
-    /** The x-coordinate of the rectangle's upper left corner. */
+	private static final long serialVersionUID = 6584214897153526799L;
+
+	/** The x-coordinate of the rectangle's upper left corner. */
     public double x;
 
     /** The y-coordinate of the rectangle's upper left corner. */
diff --git a/src/main/java/pythagoras/d/RoundRectangle.java b/src/main/java/pythagoras/d/RoundRectangle.java
index c87db15..eacd374 100644
--- a/src/main/java/pythagoras/d/RoundRectangle.java
+++ b/src/main/java/pythagoras/d/RoundRectangle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class RoundRectangle extends AbstractRoundRectangle implements Serializable
 {
-    /** The x-coordinate of the framing rectangle. */
+	private static final long serialVersionUID = -8496388509757573705L;
+
+	/** The x-coordinate of the framing rectangle. */
     public double x;
 
     /** The y-coordinate of the framing rectangle. */
diff --git a/src/main/java/pythagoras/d/Vector3.java b/src/main/java/pythagoras/d/Vector3.java
index 629eb51..69b6c67 100644
--- a/src/main/java/pythagoras/d/Vector3.java
+++ b/src/main/java/pythagoras/d/Vector3.java
@@ -14,7 +14,9 @@ import pythagoras.util.Platform;
  */
 public class Vector3 implements IVector3, Serializable
 {
-    /** A unit vector in the X+ direction. */
+	private static final long serialVersionUID = -6374261949619913930L;
+
+	/** A unit vector in the X+ direction. */
     public static final IVector3 UNIT_X = new Vector3(1f, 0f, 0f);
 
     /** A unit vector in the Y+ direction. */
diff --git a/src/main/java/pythagoras/d/Vector4.java b/src/main/java/pythagoras/d/Vector4.java
index 6dca2aa..9582d1a 100644
--- a/src/main/java/pythagoras/d/Vector4.java
+++ b/src/main/java/pythagoras/d/Vector4.java
@@ -14,7 +14,9 @@ import pythagoras.util.Platform;
  */
 public class Vector4 implements IVector4, Serializable
 {
-    /** The components of the vector. */
+	private static final long serialVersionUID = -5007926039614742505L;
+	
+	/** The components of the vector. */
     public double x, y, z, w;
 
     /**
diff --git a/src/main/java/pythagoras/f/Arc.java b/src/main/java/pythagoras/f/Arc.java
index e2219e7..053dcc8 100644
--- a/src/main/java/pythagoras/f/Arc.java
+++ b/src/main/java/pythagoras/f/Arc.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Arc extends AbstractArc implements Serializable
 {
-    /** The x-coordinate of this arc's framing rectangle. */
+	private static final long serialVersionUID = 378120636227888073L;
+
+	/** The x-coordinate of this arc's framing rectangle. */
     public float x;
 
     /** The y-coordinate of this arc's framing rectangle. */
diff --git a/src/main/java/pythagoras/f/Box.java b/src/main/java/pythagoras/f/Box.java
index 799285b..669bd3e 100644
--- a/src/main/java/pythagoras/f/Box.java
+++ b/src/main/java/pythagoras/f/Box.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Box implements IBox, Serializable
 {
-    /** The unit box. */
+	private static final long serialVersionUID = -367110846212429910L;
+
+	/** The unit box. */
     public static final Box UNIT = new Box(Vector3.UNIT_XYZ.negate(), Vector3.UNIT_XYZ);
 
     /** The zero box. */
diff --git a/src/main/java/pythagoras/f/Circle.java b/src/main/java/pythagoras/f/Circle.java
index 01e0b75..94a2c9d 100644
--- a/src/main/java/pythagoras/f/Circle.java
+++ b/src/main/java/pythagoras/f/Circle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Circle extends AbstractCircle implements Serializable
 {
-    /** The x-coordinate of the circle. */
+	private static final long serialVersionUID = -4841212861047390886L;
+
+	/** The x-coordinate of the circle. */
     public float x;
 
     /** The y-coordinate of the circle. */
diff --git a/src/main/java/pythagoras/f/CubicCurve.java b/src/main/java/pythagoras/f/CubicCurve.java
index 469b569..df16b4f 100644
--- a/src/main/java/pythagoras/f/CubicCurve.java
+++ b/src/main/java/pythagoras/f/CubicCurve.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class CubicCurve extends AbstractCubicCurve implements Serializable
 {
-    /** The x-coordinate of the start of this curve. */
+	private static final long serialVersionUID = -3306427309314031213L;
+
+	/** The x-coordinate of the start of this curve. */
     public float x1;
 
     /** The y-coordinate of the start of this curve. */
diff --git a/src/main/java/pythagoras/f/Dimension.java b/src/main/java/pythagoras/f/Dimension.java
index 2c6db71..fff8ef3 100644
--- a/src/main/java/pythagoras/f/Dimension.java
+++ b/src/main/java/pythagoras/f/Dimension.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Dimension extends AbstractDimension implements Serializable
 {
-    /** The magnitude in the x-dimension. */
+	private static final long serialVersionUID = 3237732020142181995L;
+
+	/** The magnitude in the x-dimension. */
     public float width;
 
     /** The magnitude in the y-dimension. */
diff --git a/src/main/java/pythagoras/f/Ellipse.java b/src/main/java/pythagoras/f/Ellipse.java
index 77d446a..cd58fc0 100644
--- a/src/main/java/pythagoras/f/Ellipse.java
+++ b/src/main/java/pythagoras/f/Ellipse.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Ellipse extends AbstractEllipse implements Serializable
 {
-    /** The x-coordinate of the framing rectangle. */
+	private static final long serialVersionUID = -1205529661373764424L;
+
+	/** The x-coordinate of the framing rectangle. */
     public float x;
 
     /** The y-coordinate of the framing rectangle. */
diff --git a/src/main/java/pythagoras/f/IllegalPathStateException.java b/src/main/java/pythagoras/f/IllegalPathStateException.java
index 43ace32..dcadf57 100644
--- a/src/main/java/pythagoras/f/IllegalPathStateException.java
+++ b/src/main/java/pythagoras/f/IllegalPathStateException.java
@@ -11,7 +11,9 @@ package pythagoras.f;
  */
 public class IllegalPathStateException extends RuntimeException
 {
-    public IllegalPathStateException () {
+	private static final long serialVersionUID = 5494939619370624441L;
+
+	public IllegalPathStateException () {
     }
 
     public IllegalPathStateException (String s) {
diff --git a/src/main/java/pythagoras/f/Line.java b/src/main/java/pythagoras/f/Line.java
index 7cd6060..8962229 100644
--- a/src/main/java/pythagoras/f/Line.java
+++ b/src/main/java/pythagoras/f/Line.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Line extends AbstractLine implements Serializable
 {
-    /** The x-coordinate of the start of this line segment. */
+	private static final long serialVersionUID = -1771222822536940013L;
+
+	/** The x-coordinate of the start of this line segment. */
     public float x1;
 
     /** The y-coordinate of the start of this line segment. */
diff --git a/src/main/java/pythagoras/f/Matrix3.java b/src/main/java/pythagoras/f/Matrix3.java
index 3da4487..ec276ec 100644
--- a/src/main/java/pythagoras/f/Matrix3.java
+++ b/src/main/java/pythagoras/f/Matrix3.java
@@ -15,7 +15,9 @@ import pythagoras.util.SingularMatrixException;
  */
 public class Matrix3 implements IMatrix3, Serializable
 {
-    /** the identity matrix. */
+	private static final long serialVersionUID = 2090355290484132872L;
+
+	/** the identity matrix. */
     public static final Matrix3 IDENTITY = new Matrix3();
 
     /** The values of the matrix. The names take the form {@code mCOLROW}. */
diff --git a/src/main/java/pythagoras/f/Matrix4.java b/src/main/java/pythagoras/f/Matrix4.java
index 42e6305..987123e 100644
--- a/src/main/java/pythagoras/f/Matrix4.java
+++ b/src/main/java/pythagoras/f/Matrix4.java
@@ -15,7 +15,9 @@ import pythagoras.util.SingularMatrixException;
  */
 public final class Matrix4 implements IMatrix4, Serializable
 {
-    /** The identity matrix. */
+	private static final long serialVersionUID = -4239146234415362557L;
+
+	/** The identity matrix. */
     public static final IMatrix4 IDENTITY = new Matrix4();
 
     /** An empty matrix array. */
diff --git a/src/main/java/pythagoras/f/Plane.java b/src/main/java/pythagoras/f/Plane.java
index b644c0e..6b3f508 100644
--- a/src/main/java/pythagoras/f/Plane.java
+++ b/src/main/java/pythagoras/f/Plane.java
@@ -15,7 +15,9 @@ import pythagoras.util.Platform;
  */
 public class Plane implements IPlane, Serializable
 {
-    /** The X/Y plane. */
+	private static final long serialVersionUID = -1683127117567129189L;
+
+	/** The X/Y plane. */
     public static final Plane XY_PLANE = new Plane(Vector3.UNIT_Z, 0f);
 
     /** The X/Z plane. */
diff --git a/src/main/java/pythagoras/f/Point.java b/src/main/java/pythagoras/f/Point.java
index bc93aac..02c4016 100644
--- a/src/main/java/pythagoras/f/Point.java
+++ b/src/main/java/pythagoras/f/Point.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Point extends AbstractPoint implements Serializable
 {
-    /** The x-coordinate of the point. */
+	private static final long serialVersionUID = -2666598890366249427L;
+
+	/** The x-coordinate of the point. */
     public float x;
 
     /** The y-coordinate of the point. */
diff --git a/src/main/java/pythagoras/f/QuadCurve.java b/src/main/java/pythagoras/f/QuadCurve.java
index 0d06e75..c120f69 100644
--- a/src/main/java/pythagoras/f/QuadCurve.java
+++ b/src/main/java/pythagoras/f/QuadCurve.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class QuadCurve extends AbstractQuadCurve implements Serializable
 {
-    /** The x-coordinate of the start of this curve. */
+	private static final long serialVersionUID = -6760122161413212105L;
+
+	/** The x-coordinate of the start of this curve. */
     public float x1;
 
     /** The y-coordinate of the start of this curve. */
diff --git a/src/main/java/pythagoras/f/Quaternion.java b/src/main/java/pythagoras/f/Quaternion.java
index 85be66f..e82fa69 100644
--- a/src/main/java/pythagoras/f/Quaternion.java
+++ b/src/main/java/pythagoras/f/Quaternion.java
@@ -15,7 +15,9 @@ import pythagoras.util.Platform;
  */
 public class Quaternion implements IQuaternion, Serializable
 {
-    /** The identity quaternion. */
+	private static final long serialVersionUID = 6152317379736947895L;
+
+	/** The identity quaternion. */
     public static final IQuaternion IDENTITY = new Quaternion(0f, 0f, 0f, 1f);
 
     /** The components of the quaternion. */
diff --git a/src/main/java/pythagoras/f/Rectangle.java b/src/main/java/pythagoras/f/Rectangle.java
index e17d682..f64dbe9 100644
--- a/src/main/java/pythagoras/f/Rectangle.java
+++ b/src/main/java/pythagoras/f/Rectangle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Rectangle extends AbstractRectangle implements Serializable
 {
-    /** The x-coordinate of the rectangle's upper left corner. */
+	private static final long serialVersionUID = -803067517133475390L;
+
+	/** The x-coordinate of the rectangle's upper left corner. */
     public float x;
 
     /** The y-coordinate of the rectangle's upper left corner. */
diff --git a/src/main/java/pythagoras/f/RoundRectangle.java b/src/main/java/pythagoras/f/RoundRectangle.java
index 8debb07..427c281 100644
--- a/src/main/java/pythagoras/f/RoundRectangle.java
+++ b/src/main/java/pythagoras/f/RoundRectangle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class RoundRectangle extends AbstractRoundRectangle implements Serializable
 {
-    /** The x-coordinate of the framing rectangle. */
+	private static final long serialVersionUID = 5850741513376725608L;
+
+	/** The x-coordinate of the framing rectangle. */
     public float x;
 
     /** The y-coordinate of the framing rectangle. */
diff --git a/src/main/java/pythagoras/f/Vector3.java b/src/main/java/pythagoras/f/Vector3.java
index 228ff51..7dbeabf 100644
--- a/src/main/java/pythagoras/f/Vector3.java
+++ b/src/main/java/pythagoras/f/Vector3.java
@@ -14,7 +14,9 @@ import pythagoras.util.Platform;
  */
 public class Vector3 implements IVector3, Serializable
 {
-    /** A unit vector in the X+ direction. */
+	private static final long serialVersionUID = -3884541171214417861L;
+
+	/** A unit vector in the X+ direction. */
     public static final IVector3 UNIT_X = new Vector3(1f, 0f, 0f);
 
     /** A unit vector in the Y+ direction. */
diff --git a/src/main/java/pythagoras/f/Vector4.java b/src/main/java/pythagoras/f/Vector4.java
index b3438d0..3635f69 100644
--- a/src/main/java/pythagoras/f/Vector4.java
+++ b/src/main/java/pythagoras/f/Vector4.java
@@ -14,7 +14,9 @@ import pythagoras.util.Platform;
  */
 public class Vector4 implements IVector4, Serializable
 {
-    /** The components of the vector. */
+	private static final long serialVersionUID = -775706366125314150L;
+	
+	/** The components of the vector. */
     public float x, y, z, w;
 
     /**
diff --git a/src/main/java/pythagoras/i/Dimension.java b/src/main/java/pythagoras/i/Dimension.java
index ad544ab..d6daf75 100644
--- a/src/main/java/pythagoras/i/Dimension.java
+++ b/src/main/java/pythagoras/i/Dimension.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Dimension extends AbstractDimension implements Serializable
 {
-    /** The magnitude in the x-dimension. */
+	private static final long serialVersionUID = 5773214044931265346L;
+
+	/** The magnitude in the x-dimension. */
     public int width;
 
     /** The magnitude in the y-dimension. */
diff --git a/src/main/java/pythagoras/i/Point.java b/src/main/java/pythagoras/i/Point.java
index d816045..75fd9a3 100644
--- a/src/main/java/pythagoras/i/Point.java
+++ b/src/main/java/pythagoras/i/Point.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Point extends AbstractPoint implements Serializable
 {
-    /** The x-coordinate of the point. */
+	private static final long serialVersionUID = -6346341779228562585L;
+
+	/** The x-coordinate of the point. */
     public int x;
 
     /** The y-coordinate of the point. */
diff --git a/src/main/java/pythagoras/i/Rectangle.java b/src/main/java/pythagoras/i/Rectangle.java
index 88a95e4..2a75827 100644
--- a/src/main/java/pythagoras/i/Rectangle.java
+++ b/src/main/java/pythagoras/i/Rectangle.java
@@ -11,7 +11,9 @@ import java.io.Serializable;
  */
 public class Rectangle extends AbstractRectangle implements Serializable
 {
-    /** The x-coordinate of the rectangle's upper left corner. */
+	private static final long serialVersionUID = -2937911833523020174L;
+
+	/** The x-coordinate of the rectangle's upper left corner. */
     public int x;
 
     /** The y-coordinate of the rectangle's upper left corner. */
diff --git a/src/main/java/pythagoras/util/NoninvertibleTransformException.java b/src/main/java/pythagoras/util/NoninvertibleTransformException.java
index f9d6321..0d439cb 100644
--- a/src/main/java/pythagoras/util/NoninvertibleTransformException.java
+++ b/src/main/java/pythagoras/util/NoninvertibleTransformException.java
@@ -10,7 +10,9 @@ package pythagoras.util;
  */
 public class NoninvertibleTransformException extends RuntimeException
 {
-    public NoninvertibleTransformException (String s) {
+	private static final long serialVersionUID = 5208863644264280750L;
+
+	public NoninvertibleTransformException (String s) {
         super(s);
     }
 }
diff --git a/src/main/java/pythagoras/util/SingularMatrixException.java b/src/main/java/pythagoras/util/SingularMatrixException.java
index 0687b34..4c6631e 100644
--- a/src/main/java/pythagoras/util/SingularMatrixException.java
+++ b/src/main/java/pythagoras/util/SingularMatrixException.java
@@ -9,7 +9,9 @@ package pythagoras.util;
  */
 public class SingularMatrixException extends RuntimeException
 {
-    /**
+	private static final long serialVersionUID = -4744745375693073952L;
+
+	/**
      * Creates a new exception.
      */
     public SingularMatrixException () {