Skip to content

Commit

Permalink
Renamed stasiak.karol.units to stasiak.units
Browse files Browse the repository at this point in the history
  • Loading branch information
KarolS committed Nov 5, 2013
1 parent 3d3b482 commit 8cf8b18
Show file tree
Hide file tree
Showing 93 changed files with 511 additions and 511 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ Quick showcase
==============

``` scala
import stasiak.karol.units._
import stasiak.karol.units.defining._
import stasiak.units._
import stasiak.units.defining._

type USD = DefineUnit[_U~:_S~:_D]
type EUR = DefineUnit[_E~:_U~:_R]

implicit val EUR_to_USD = one[EUR].contains(1.25)[USD]

import stasiak.karol.units.SI._
import stasiak.karol.units.USCustomary._
import stasiak.units.SI._
import stasiak.units.USCustomary._

val priceInUSA = 200.of[USD/square[foot]]
val priceInGermany = 1500.of[EUR/square[metre]]
Expand Down Expand Up @@ -85,8 +85,8 @@ Defining units
You define a unit using `DefineUnit` type constructor with a type-level string as a parameter.

``` scala
import stasiak.karol.units._
import stasiak.karol.units.defining._
import stasiak.units._
import stasiak.units.defining._

type metre = DefineUnit[_m]
type second = DefineUnit[_s]
Expand Down Expand Up @@ -132,7 +132,7 @@ implicit val kgm_to_kgcm = m_to_cm.times[kilogram]
implicit val mps_to_cmps = m_to_cm.dividedBy[second]
```

See sources for `stasiak.karol.units.SI` and `stasiak.karol.units.USCustomary` objects for more examples.
See sources for `stasiak.units.SI` and `stasiak.units.USCustomary` objects for more examples.


Using values with units
Expand All @@ -141,7 +141,7 @@ Using values with units
All code below assumes the following is imported:

``` scala
import stasiak.karol.units._
import stasiak.units._
```

You can create a value with a unit:
Expand Down Expand Up @@ -313,8 +313,8 @@ AffineSpace is defined as a pair containing a zero point and a unit.


``` scala
import stasiak.karol.units._
import stasiak.karol.units.defining._
import stasiak.units._
import stasiak.units.defining._

type celsius_deg = DefineUnit[_deg~:_C]
sealed trait CelsiusZero
Expand Down
2 changes: 1 addition & 1 deletion doc/ARRAYS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Using arrays
============

Sadly, Scala 2.10's arrays of value classes are boxed. As an alternative, `stasiak.karol.units.arrays` package provides classes `DoubleUArray[U]`, `DoubleAArray[A]`, `IntUArray[U]`, and `IntAArray[A]`.
Sadly, Scala 2.10's arrays of value classes are boxed. As an alternative, `stasiak.units.arrays` package provides classes `DoubleUArray[U]`, `DoubleAArray[A]`, `IntUArray[U]`, and `IntAArray[A]`.

All of them implement `IndexedSeq` and can be used like standard collection classes:

Expand Down
12 changes: 6 additions & 6 deletions doc/BINDINGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Artefact `units-scalaz` provides implementations of following typeclasses:

* for `Vector3A`: `Equal`, `Show`

Usage: `import stasiak.karol.units.scalazSupport._`
Usage: `import stasiak.units.scalazSupport._`

Spire
-----
Expand All @@ -45,7 +45,7 @@ Artefact `units-spire` provides implementations of following typeclasses:

* for `Vector3U`: `VectorSpace[Vector3U[U], Double]`

Usage: `import stasiak.karol.units.spireSupport._`
Usage: `import stasiak.units.spireSupport._`

Scalacheck
----------
Expand All @@ -56,7 +56,7 @@ Currently, only Scalacheck 1.10.x is supported.

Artefact `units-scalacheck` provides implementations of `Choose[IntU[U]]`, `Choose[DoubleU[U]]`, `Choose[IntA[A]]` and `Choose[DoubleA[A]]`.

Usage: `import stasiak.karol.units.scalacheckSupport._`
Usage: `import stasiak.units.scalacheckSupport._`

Joda Time
---------
Expand All @@ -67,7 +67,7 @@ Currently, only Joda Time 2.1 and above is supported.

Artefact `units-joda` provides implicit conversions from and to `Duration`, `Seconds`, `Minutes`, and `Hours` classes.

Usage: `import stasiak.karol.units.jodaSupport._`
Usage: `import stasiak.units.jodaSupport._`

Algebird
--------
Expand All @@ -78,7 +78,7 @@ Currently, only Algebird 0.1.13 is supported.

Artefact `units-algebird` provides implementations of `Monoid`, `Group` and `VectorSpace` for `IntU`, `DoubleU`, `Vector2U` and `Vector3U` (except for `VectorSpace` for `IntU`).

Usage: `import stasiak.karol.units.algebirdSupport._`
Usage: `import stasiak.units.algebirdSupport._`

Slick
-----
Expand All @@ -89,4 +89,4 @@ Currently, only Slick 1.0.x is supported. Support for Slick 2.0 will follow afte

Artefact `units-slick` provides implementations of column mappings for `IntU`, `IntA`, `DoubleU` and `DoubleA`.

Usage: `import stasiak.karol.units.slick1Support`
Usage: `import stasiak.units.slick1Support`
4 changes: 2 additions & 2 deletions doc/CUSTOM.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Custom types with units
Since 0.0.8, you can create add units to any type `N` you want. It will support arithmetic operations if there is an implementation of `Numeric[N]` and comparisons if there's `Ordering[N]`.

```scala
import stasiak.karol.units._
import stasiak.karol.units.SI._
import stasiak.units._
import stasiak.units.SI._

val x: WithU[BigInt, metre] = BigInt(100).of[metre]
val y: WithU[BigInt, metre] = BigInt(50).of[metre]
Expand Down
6 changes: 3 additions & 3 deletions doc/POLYMORPHISM.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ val workday = 8.of[hour]
MKS[T](workday.convert[second]) // explicit conversion required
```

A subset of generic units is defined in `stasiak.karol.units.Mechanical`. By using it, the example above could be rewritten as:
A subset of generic units is defined in `stasiak.units.Mechanical`. By using it, the example above could be rewritten as:

``` scala
import stasiak.karol.units.Mechanical._
import stasiak.karol.units.SI._
import stasiak.units.Mechanical._
import stasiak.units.SI._

def position(x0: DoubleU[length], v0: DoubleU[speed], a: DoubleU[acceleration], t:DoubleU[time]) =
x0 + v0*t + a*t*t/2
Expand Down
2 changes: 1 addition & 1 deletion doc/VECTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ All of the array classes implement `IndexedSeq` and can be used like standard co
They can be created in several ways:

``` scala
import stasiak.karol.units.arrays._
import stasiak.units.arrays._

Vector2UArray.of[metre]((1,2), (4,5))

Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package stasiak.karol.units
package stasiak.units

import sbt._
import Keys._
Expand Down
6 changes: 3 additions & 3 deletions units-algebird/src/main/scala/algebirdSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

import stasiak.karol.units.SI._
import stasiak.karol.units.SI.Short._
import stasiak.units.SI._
import stasiak.units.SI.Short._
import com.twitter.algebird._
import language.implicitConversions

Expand Down
6 changes: 3 additions & 3 deletions units-joda/src/main/scala/jodaSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

import stasiak.karol.units.SI._
import stasiak.karol.units.SI.Short._
import stasiak.units.SI._
import stasiak.units.SI.Short._
import org.joda.time._
import language.implicitConversions

Expand Down
2 changes: 1 addition & 1 deletion units-scalacheck/src/main/scala/ScalacheckSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

package stasiak.karol.units
package stasiak.units

import org.scalacheck._
import language.implicitConversions
Expand Down
2 changes: 1 addition & 1 deletion units-scalaz/src/main/scala/ScalazSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

package stasiak.karol.units
package stasiak.units

import scalaz.{Ordering, Monoid, Show, Order, Equal}

Expand Down
4 changes: 2 additions & 2 deletions units-scalaz/src/test/scala/ScalazSupportSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

package stasiak.karol.units
package stasiak.units

import org.scalatest.FunSuite
import stasiak.karol.units.scalazSupport._
import stasiak.units.scalazSupport._
import SI._
import USCustomary._
import scalaz._
Expand Down
6 changes: 3 additions & 3 deletions units-slick/src/main/scala/Slick1Support.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

import stasiak.karol.units.SI._
import stasiak.karol.units.SI.Short._
import stasiak.units.SI._
import stasiak.units.SI.Short._
import scala.slick.lifted._
import language.implicitConversions

Expand Down
4 changes: 2 additions & 2 deletions units-slick/src/test/scala/Slick1SupportSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

package stasiak.karol.units
package stasiak.units

import org.scalatest._
import stasiak.karol.units.slick1Support._
import stasiak.units.slick1Support._
import SI._
import USCustomary._
import scala.slick.driver.H2Driver.simple._
Expand Down
4 changes: 2 additions & 2 deletions units-spire/src/main/scala/SpireSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

package stasiak.karol.units
package stasiak.units

import spire.algebra._
import spire.math._
import stasiak.karol.units._
import stasiak.units._
import language.implicitConversions

package object spireSupport {
Expand Down
16 changes: 8 additions & 8 deletions units/src/main/scala/AffineSpace.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

import language.higherKinds
import language.implicitConversions
import stasiak.karol.units.internal.Bools._
import stasiak.karol.units.internal.Integers._
import stasiak.karol.units.internal.Strings._
import stasiak.karol.units.internal.SingleUnits._
import stasiak.karol.units.internal.UnitImpl._
import stasiak.karol.units.internal.Conversions._
import stasiak.karol.units.internal.AffineSpaces._
import stasiak.units.internal.Bools._
import stasiak.units.internal.Integers._
import stasiak.units.internal.Strings._
import stasiak.units.internal.SingleUnits._
import stasiak.units.internal.UnitImpl._
import stasiak.units.internal.Conversions._
import stasiak.units.internal.AffineSpaces._

/**
Supertype of all affine spaces.
Expand Down
22 changes: 11 additions & 11 deletions units/src/main/scala/AffineSpaceConversion.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ 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.
*/
package stasiak.karol.units.defining
package stasiak.units.defining

import language.higherKinds
import language.implicitConversions
import stasiak.karol.units.{DoubleRatio=>_, _}
import stasiak.karol.units.internal.ratios._
import stasiak.karol.units.internal.UnitImpl._
import stasiak.karol.units.internal.Strings
import stasiak.karol.units.internal.Strings._
import stasiak.karol.units.internal.Integers._
import stasiak.karol.units.internal.Conversions._
import stasiak.karol.units.internal.AffineSpaces
import stasiak.karol.units.internal.AffineSpaces._
import stasiak.karol.units.internal.SingleUnits._
import stasiak.units.{DoubleRatio=>_, _}
import stasiak.units.internal.ratios._
import stasiak.units.internal.UnitImpl._
import stasiak.units.internal.Strings
import stasiak.units.internal.Strings._
import stasiak.units.internal.Integers._
import stasiak.units.internal.Conversions._
import stasiak.units.internal.AffineSpaces
import stasiak.units.internal.AffineSpaces._
import stasiak.units.internal.SingleUnits._

sealed trait ReversibleDoubleAConversion[A<:AffineSpace, B<:AffineSpace]{
val forward: Double=>Double
Expand Down
22 changes: 11 additions & 11 deletions units/src/main/scala/DefiningUnits.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

/**
Package containing helper types and methods for defining new units and ratios between units.
Usage:
`import stasiak.karol.units.defining._`
`import stasiak.units.defining._`
*/
package object defining {
import language.higherKinds
import language.implicitConversions
import stasiak.karol.units.internal.ratios._
import stasiak.karol.units.internal.UnitImpl._
import stasiak.karol.units.internal.Strings
import stasiak.karol.units.internal.Strings._
import stasiak.karol.units.internal.Integers._
import stasiak.karol.units.internal.Conversions._
import stasiak.karol.units.internal.AffineSpaces
import stasiak.karol.units.internal.AffineSpaces._
import stasiak.karol.units.internal.SingleUnits._
import stasiak.units.internal.ratios._
import stasiak.units.internal.UnitImpl._
import stasiak.units.internal.Strings
import stasiak.units.internal.Strings._
import stasiak.units.internal.Integers._
import stasiak.units.internal.Conversions._
import stasiak.units.internal.AffineSpaces
import stasiak.units.internal.AffineSpaces._
import stasiak.units.internal.SingleUnits._

/** Helper for defining unit ratios. Syntax: `one[kilometre].contains(1000)[metre]` */
@inline def one[U<:MUnit] = new OneBuilder[U]
Expand Down
20 changes: 10 additions & 10 deletions units/src/main/scala/DoubleA.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ 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.
*/
package stasiak.karol.units
package stasiak.units

import language.higherKinds
import language.implicitConversions
import stasiak.karol.units.internal.ratios._
import stasiak.karol.units.internal.Bools._
import stasiak.karol.units.internal.Integers._
import stasiak.karol.units.internal.Strings._
import stasiak.karol.units.internal.SingleUnits._
import stasiak.karol.units.internal.UnitImpl._
import stasiak.karol.units.internal.Conversions._
import stasiak.karol.units.internal.AffineSpaces._
import stasiak.karol.units.internal.UnitName
import stasiak.units.internal.ratios._
import stasiak.units.internal.Bools._
import stasiak.units.internal.Integers._
import stasiak.units.internal.Strings._
import stasiak.units.internal.SingleUnits._
import stasiak.units.internal.UnitImpl._
import stasiak.units.internal.Conversions._
import stasiak.units.internal.AffineSpaces._
import stasiak.units.internal.UnitName

object DoubleA {
private type Aff = DefineAffineSpace[Nothing, _1]
Expand Down
Loading

0 comments on commit 8cf8b18

Please sign in to comment.