Skip to content

Commit

Permalink
Merge branch 'tomhanika:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rjoberon authored Sep 16, 2024
2 parents 320681e + 4b3a922 commit 0c57b2c
Show file tree
Hide file tree
Showing 87 changed files with 4,501 additions and 1,083 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v17
- run: nix run .#test
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v2
- run: nix flake check
6 changes: 4 additions & 2 deletions .github/workflows/update-deps-lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ on:

jobs:
update-lock:
if: startsWith(github.ref, 'refs/heads/')
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v17
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v2
- name: Update deps-lock
run: "nix run .#deps-lock"
run: nix run .#deps-lock

- name: Create Pull Request
uses: peter-evans/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
/doc/icfca-2013-tutorial/icfca2013-tutorial-talk.vrb
/doc/tutorials/icfca-2013/icfca2013-tutorial-live.html
/.lsp/
/.direnv/
/.direnv/
/.clj-kondo/
6 changes: 4 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ Additional Contributors are
* Immanuel Albrecht (Context Editor Plugin for the GUI)
* Sebastian Benner (API)
* Stefan Borgwardt (Shared Intents)
* Jana Fischer (json format)
* Jana Fischer (json format, Simplicial Complex, Ordinal Motifs, scale-measures)
* Tom Hanika (Concept Probability)
* Johannes Hirth (pq-cores, scale-measures)
* Johannes Hirth (pq-cores, Ordinal Motifs, scale-measures)
* Gleb Kanterov (interval-scale)
* Maximilian Marx (Wikidata)
* Jannik Nordmeyer (Metric Contexts, Causal Implications)
* Maximilian Stubbemann (concept-robustness)
* Anselm von Wangenheim (DimDraw)
* Johannes Wollbold (bug reports, feature requests)

5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# conexp-clj [![Build Status](https://img.shields.io/github/actions/workflow/status/tomhanika/conexp-clj/run-tests.yaml?branch=dev&label=build)](https://github.com/tomhanika/conexp-clj/actions/workflows/run-tests.yaml) [![built with nix](https://img.shields.io/static/v1?logo=nixos&logoColor=white&label=&message=Built%20with%20Nix&color=41439a)](https://builtwithnix.org)
# conexp-clj [![Build Status](https://img.shields.io/github/actions/workflow/status/tomhanika/conexp-clj/run-tests.yaml?branch=dev&label=build)](https://github.com/tomhanika/conexp-clj/actions/workflows/run-tests.yaml) [![Clojars Project](https://img.shields.io/clojars/v/conexp-clj.svg)](https://clojars.org/conexp-clj) [![built with nix](https://img.shields.io/static/v1?logo=nixos&logoColor=white&label=&message=Built%20with%20Nix&color=41439a)](https://builtwithnix.org)

This is conexp-clj, a general purpose software tool for [Formal Concept
Analysis](http://www.upriss.org.uk/fca/fca.html). Its main purpose is to
Expand Down Expand Up @@ -32,6 +32,7 @@ much more.
8. [Computing Traces in Contexts](doc/code/trace-context.clj)
9. [Counting Quasiorders](doc/code/quasiorders.clj)
10. [Rudolph's Algorithm for Computing Bases](doc/code/rudolph_computation.clj)
11. [Discovering Causal Implications](doc/Causal-Implications.org)
5. Advanced Topics
1. [pq-cores](doc/pq-cores-in-Formal-Contexts.md)
2. [REST-API Usage](doc/REST-API-usage.md)
Expand Down Expand Up @@ -93,7 +94,7 @@ would appreciate if you use the following reference.

## License

Copyright ⓒ 2009—2018 Daniel Borchmann, 2018–2023 Tom Hanika
Copyright ⓒ 2009—2018 Daniel Borchmann, 2018–2024 Tom Hanika

Distributed under the Eclipse Public License.

Expand Down
Loading

0 comments on commit 0c57b2c

Please sign in to comment.