Skip to content

Commit

Permalink
Merge pull request #7 from aenarete/dev
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
ufechner7 authored Mar 9, 2024
2 parents 4e21fad + fdb9507 commit e0bf551
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6'
- '1.9'
- '1'
- '~1.8.0-beta3'
- 'nightly'
os:
- ubuntu-latest
arch:
Expand Down
6 changes: 2 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
name = "WinchModels"
uuid = "7dcfa46b-7979-4771-bbf4-0aee0da42e1f"
authors = ["Uwe Fechner <[email protected]> and contributors"]
version = "0.1.1"
version = "0.2.0"

[deps]
KiteUtils = "90980105-b163-44e5-ba9f-8b1c83bb0533"
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
TestEnv = "1e6cf692-eddd-4d53-88a5-2d735e33781b"

[compat]
KiteUtils = "0.4"
KiteUtils = "0.5"
Parameters = "0.12"
TestEnv = "1"
julia = "1"

[extras]
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ wind energy system. A ground station has the following components:
Currently implemented is a model of the 20kW ground station from Delft University of Technology.

## Installation
First, install Julia 1.9 or higher. Then launch Julia and install this package using the package manager.
```julia
]add https://github.com/aenarete/WinchModels.jl
]
add WinchModels
```

## Exported types
Expand All @@ -24,8 +26,8 @@ AsyncMachine

## Main functions
```julia
calc_acceleration(wm::AsyncGenerator, set_speed, speed, force, use_brake = false)
calc_force(wm::AsyncGenerator, set_speed, speed)
calc_acceleration(wm::AsyncMachine, set_speed, speed, force, use_brake = false)
calc_force(wm::AsyncMachine, set_speed, speed)
```
<p align="center"><img src="./docs/working_principle.png" width="800" /></p>

Expand All @@ -48,7 +50,7 @@ smooth_sign
```julia
using WinchModels, BenchmarkTools

wm = AsyncGenerator()
wm = AsyncMachine()
@benchmark calc_acceleration(wm, 7.9, 8.0, 100.0)
```
On i7-7700K 17ns for Julia, 1050ns with Python.
Expand Down
1 change: 1 addition & 0 deletions bin/run_julia
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LANG=en_US julia --project

0 comments on commit e0bf551

Please sign in to comment.