Quaternion: move type definition outside of module

src/FSharp/FSharp.fsproj

@@ -74,9 +74,9 @@
     <Compile Include="Fit.fs" />
     <Compile Include="FindRoots.fs" />
     <Compile Include="RandomVariable.fs" />
+    <Compile Include="Quaternion.fs" />
     <None Include="MathNet.Numerics.fsx" />
     <None Include="MathNet.Numerics.IfSharp.fsx" />
-    <Compile Include="Quaternion.fs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />

src/FSharp/Quaternion.fs

@@ -1,10 +1,34 @@
-module MathNet.Numerics.Quaternion
+// <copyright file="Quaternion.fs" company="Math.NET">
+// Math.NET Numerics, part of the Math.NET Project
+// http://numerics.mathdotnet.com
+// http://github.com/mathnet/mathnet-numerics
+// http://mathnetnumerics.codeplex.com
+//
+// Copyright (c) 2009-2016 Math.NET
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+// </copyright>
 
-//Reference:
+namespace MathNet.Numerics
-//http://www.astro.rug.nl/software/kapteyn/_downloads/attitude.pdf
-//http://www.mathworks.com/help/aeroblks/quaternionmultiplication.html
-//http://www.mathworks.com/help/aeroblks/quaterniondivision.html
-//https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation#The_conjugation_operation
 
 type Quaternion =
     {
@@ -13,16 +37,20 @@ type Quaternion =
         y:float
         z:float
     } with
+
     static member (+) (r: Quaternion, q: Quaternion) =
         {w=r.w+q.w;x=r.x+q.x;y=r.y+q.y;z=r.z+q.z}
+
     static member (-) (r: Quaternion, q: Quaternion) =
         {w=r.w-q.w;x=r.x-q.x;y=r.y-q.y;z=r.z-q.z}
+
     static member (*) (r: Quaternion, q: Quaternion) =
         let w = r.w*q.w - r.x*q.x - r.y*q.y - r.z*q.z
         let x = r.w*q.x + r.x*q.w - r.y*q.z + r.z*q.y
         let y = r.w*q.y + r.x*q.z + r.y*q.w - r.z*q.x
         let z = r.w*q.z - r.x*q.y + r.y*q.x + r.z*q.w
         {w=w;x=x;y=y;z=z}
+
     static member (/) (r: Quaternion, q: Quaternion) =
         let d = (r.w**2.0 + r.x**2.0 + r.y**2.0 + r.z**2.0)
 
@@ -31,9 +59,20 @@ type Quaternion =
         let y = (r.w*q.y + r.x*q.z - r.y*q.w - r.z*q.x) / d
         let z = (r.w*q.z - r.x*q.y + r.y*q.x - r.z*q.w) / d
         {w=w;x=x;y=y;z=z}
+
     static member (/) (q:Quaternion, a) =
         {w=q.w/a; x=q.x/a;y=q.y/a;z=q.z/a}
 
+
+[<RequireQualifiedAccess; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Quaternion =
+
+    //Reference:
+    //http://www.astro.rug.nl/software/kapteyn/_downloads/attitude.pdf
+    //http://www.mathworks.com/help/aeroblks/quaternionmultiplication.html
+    //http://www.mathworks.com/help/aeroblks/quaterniondivision.html
+    //https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation#The_conjugation_operation
+
     let norm q =
         q.w**2.0 + q.x**2.0 + q.y**2.0 + q.z**2.0
 

src/FSharpUnitTests/FSharpUnitTests.fsproj

@@ -85,9 +85,9 @@
     <Compile Include="PokerTests.fs" />
     <Compile Include="FitTests.fs" />
     <Compile Include="FindRootsTests.fs" />
+    <Compile Include="QuaternionTests.fs" />
     <None Include="paket.references" />
     <None Include="App.config" />
-    <Compile Include="QuaternionTests.fs" />
   </ItemGroup>
   <PropertyGroup>
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>

src/FSharpUnitTests/QuaternionTests.fs

@@ -3,7 +3,7 @@
 open System
 open NUnit.Framework
 open FsUnit
-open MathNet.Numerics.Quaternion
+open MathNet.Numerics
 
 module QuaternionTests =
 
@@ -17,15 +17,15 @@ module QuaternionTests =
     [<Test>]
     let ``Quaternion.create`` () =
         let fourtyFiveDegreesInRadians = 45.0 * Math.PI / 180.0
-        create fourtyFiveDegreesInRadians 1.0 0.0 0.0 |> 
+        Quaternion.create fourtyFiveDegreesInRadians 1.0 0.0 0.0 |>
             should equal {w = 0.92387953251128674; x = 0.38268343236508978; y = 0.0; z = 0.0;}
 
     [<Test>]
     let ``Quaternion.create normalizes input vector`` () =
         let fourtyFiveDegreesInRadians = 45.0 * Math.PI / 180.0
-        create fourtyFiveDegreesInRadians 100.0 0.0 0.0 |> 
+        Quaternion.create fourtyFiveDegreesInRadians 100.0 0.0 0.0 |>
             should equal <|
-                create fourtyFiveDegreesInRadians 1.0 0.0 0.0 
+                Quaternion.create fourtyFiveDegreesInRadians 1.0 0.0 0.0
 
     [<Test>]
     let ``Quaternion.+`` () =
@@ -46,24 +46,24 @@ module QuaternionTests =
     //http://www.mathworks.com/help/aerotbx/ug/quatnorm.html
     [<Test>]
     let ``Quaternion.Norm`` () =
-        norm n' |> should equal 0.75
+        Quaternion.norm n' |> should equal 0.75
 
     //http://www.mathworks.com/help/aerotbx/ug/quatnormalize.html
     [<Test>]
     let ``Quaternion.Normalize`` () =
-        normalize n |> should equal {w= 0.70710678118654746; x= 0.0; y= 0.70710678118654746; z= 0.0}
+        Quaternion.normalize n |> should equal {w= 0.70710678118654746; x= 0.0; y= 0.70710678118654746; z= 0.0}
 
     //http://www.mathworks.com/help/aerotbx/ug/quatinv.html
     [<Test>]
     let ``Quaternion.Inverse`` () =
-        inverse n |> should equal {w= 0.5;x= 0.0;y= -0.5;z= 0.0}
+        Quaternion.inverse n |> should equal {w= 0.5;x= 0.0;y= -0.5;z= 0.0}
 
     //http://www.mathworks.com/help/aerotbx/ug/quatconj.html
     [<Test>]
     let ``Quaternion.Conjugate`` () =
-        conjugate n |> should equal {w= 1.0;x= 0.0;y= -1.0;z= 0.0}
+        Quaternion.conjugate n |> should equal {w= 1.0;x= 0.0;y= -1.0;z= 0.0}
 
     //http://www.mathworks.com/help/aerotbx/ug/quatrotate.html
     [<Test>]
     let ``Quaternion.Rotate`` () =
-        rotate n 1.0 1.0 1.0 |> should equal {w= 0.0;x= -1.0;y= 1.0;z= 1.0}
+        Quaternion.rotate n 1.0 1.0 1.0 |> should equal {w= 0.0;x= -1.0;y= 1.0;z= 1.0}