Skip to content

Commit

Permalink
Rename branch 'master' to 'main'
Browse files Browse the repository at this point in the history
The default branch has been renamed!
master is now named main

If you have a local clone, you can update it by running the following commands.

```shell

  git branch -m master main
  git fetch origin
  git branch -u origin/main main
  git remote set-head origin -a
  ```
  • Loading branch information
VaeterchenFrost committed Dec 19, 2024
1 parent d06ca9a commit 461204b
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/directory_writer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"

jobs:
Update_DIRECTORY:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: Tests

on:
push:
branches: [master]
branches: [main]
paths-ignore:
- "doc/**"
- "gh-disabled-workflows/**"
- "*.md"
pull_request:
branches: [master]
branches: [main]
paths-ignore:
- "doc/**"
- "gh-disabled-workflows/**"
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ See [#47]

- Added the possibility to specify and create multiple graph-visualizations in one file [#25]
- Added test case _test_vc_multiple_and_join_ in [commit aa31901](https://github.com/VaeterchenFrost/tdvisu/commit/aa319016ac71f9a54023474bf820cb30929c52a8)
- Added test cases for [construct_dpdb_visu](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_construct_dpdb.py)
- Added test cases for [construct_dpdb_visu](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_construct_dpdb.py)
- Add pytest-mock to tests_require

### Changed
Expand Down Expand Up @@ -275,9 +275,9 @@ See [#47]
[@VaeterchenFrost]: https://github.com/VaeterchenFrost
[PyPI]: https://pypi.org/project/tdvisu/
[mypy]: https://github.com/python/mypy
[DIRECTORY]: https://github.com/VaeterchenFrost/tdvisu/blob/master/DIRECTORY.md
[DIRECTORY]: https://github.com/VaeterchenFrost/tdvisu/blob/main/DIRECTORY.md
[Codecov]: https://codecov.io/gh/VaeterchenFrost/tdvisu
[Unreleased]: https://github.com/VaeterchenFrost/tdvisu/compare/v1.2.0...master
[Unreleased]: https://github.com/VaeterchenFrost/tdvisu/compare/v1.2.0...main
[1.2.0]: https://github.com/VaeterchenFrost/tdvisu/releases/tag/v1.2.0
[1.1.9]: https://github.com/VaeterchenFrost/tdvisu/releases/tag/v1.1.9
[1.1.8]: https://github.com/VaeterchenFrost/tdvisu/releases/tag/v1.1.8
Expand Down
34 changes: 17 additions & 17 deletions DIRECTORY.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

## [Setup](https://github.com/VaeterchenFrost/tdvisu/blob/master/setup.py)
## [Setup](https://github.com/VaeterchenFrost/tdvisu/blob/main/setup.py)

## Tdvisu
* [Construct Dpdb Visu](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/construct_dpdb_visu.py)
* [Dijkstra](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/dijkstra.py)
* [Reader](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/reader.py)
* [Svgjoin](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/svgjoin.py)
* [Utilities](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/utilities.py)
* [Version](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/version.py)
* [Visualization](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/visualization.py)
* [Visualization Data](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/visualization_data.py)
* [Construct Dpdb Visu](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/construct_dpdb_visu.py)
* [Dijkstra](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/dijkstra.py)
* [Reader](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/reader.py)
* [Svgjoin](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/svgjoin.py)
* [Utilities](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/utilities.py)
* [Version](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/version.py)
* [Visualization](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/visualization.py)
* [Visualization Data](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/visualization_data.py)

## Test
* [Test Bag Creation](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_bag_creation.py)
* [Test Construct Dpdb](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_construct_dpdb.py)
* [Test Dijkstra](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_dijkstra.py)
* [Test Reader](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_reader.py)
* [Test Svgjoin](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_svgjoin.py)
* [Test Utilities](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_utilities.py)
* [Test Version](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_version.py)
* [Test Visualization](https://github.com/VaeterchenFrost/tdvisu/blob/master/test/test_visualization.py)
* [Test Bag Creation](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_bag_creation.py)
* [Test Construct Dpdb](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_construct_dpdb.py)
* [Test Dijkstra](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_dijkstra.py)
* [Test Reader](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_reader.py)
* [Test Svgjoin](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_svgjoin.py)
* [Test Utilities](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_utilities.py)
* [Test Version](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_version.py)
* [Test Visualization](https://github.com/VaeterchenFrost/tdvisu/blob/main/test/test_visualization.py)
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)
[![PyPI license](https://img.shields.io/pypi/l/tdvisu.svg)](https://pypi.python.org/pypi/tdvisu/)
![Tests](https://github.com/VaeterchenFrost/tdvisu/workflows/Tests/badge.svg)
[![codecov](https://codecov.io/gh/VaeterchenFrost/tdvisu/branch/master/graph/badge.svg)](https://codecov.io/gh/VaeterchenFrost/tdvisu)
[![codecov](https://codecov.io/gh/VaeterchenFrost/tdvisu/branch/main/graph/badge.svg)](https://codecov.io/gh/VaeterchenFrost/tdvisu)

![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/vaeterchenfrost/tdvisu?include_prereleases)
[![PyPI version fury.io](https://badge.fury.io/py/tdvisu.svg)](https://pypi.python.org/pypi/tdvisu/)
Expand Down Expand Up @@ -132,11 +132,11 @@ pytest ./test/

# How to use

The visualization needs input in the form of the [Json API](https://github.com/VaeterchenFrost/gpusat-VISU/blob/master/JsonAPI_v1.3.md).
The visualization needs input in the form of the [Json API](https://github.com/VaeterchenFrost/gpusat-VISU/blob/main/JsonAPI_v1.3.md).
The creation of this file is exemplary implemented in _construct_dpdb_visu.py_ or the fork [GPUSAT](https://github.com/VaeterchenFrost/GPUSAT) and _--visufile filename_ (optionally disabling preprocessing with _-p_).

Run the python file with the above dependencies installed:
[visualization.py](https://github.com/VaeterchenFrost/gpusat-VISU/blob/master/satvisualization_repo/satvisu/visualization.py)
[visualization.py](https://github.com/VaeterchenFrost/gpusat-VISU/blob/main/satvisualization_repo/satvisu/visualization.py)

**visualization.py** takes two parameters, the json-**infile** to read from, and optionally one **outputfolder**.
With both arguments a run might look like this:
Expand All @@ -153,13 +153,13 @@ For #SAT it produces for example three different graphs suffixed with a running

The graphs are images encoded in resolution independent **.svg files** (see https://www.lifewire.com/svg-file-4120603)

<p align="center"><img src="https://raw.githubusercontent.com/VaeterchenFrost/tdvisu/master/doc/images/combined6DA4.svg?sanitize=true" width="70%"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/VaeterchenFrost/tdvisu/main/doc/images/combined6DA4.svg?sanitize=true" width="70%"/></p>

## How to use construct_dpdb_visu.py

After installing the project [dp_on_dbs](https://github.com/hmarkus/dp_on_dbs) with the there listed [requirements](https://github.com/hmarkus/dp_on_dbs#requirements), we need to

- edit the [database.ini](https://github.com/VaeterchenFrost/tdvisu/blob/master/tdvisu/database.ini) with our password to [postgresql](https://www.postgresql.org/)
- edit the [database.ini](https://github.com/VaeterchenFrost/tdvisu/blob/main/tdvisu/database.ini) with our password to [postgresql](https://www.postgresql.org/)
- Solve a problem with `python dpdb.py [GENERAL-OPTIONS] -f <INPUT-FILE> <PROBLEM> [PROBLEM-SPECIFIC-OPTIONS]`
- for the problem **VertexCover**
- with flag `--gr-file` to store the htd Input (if the input was in a different format)
Expand Down Expand Up @@ -206,7 +206,7 @@ In case dependencies have changed, or just to update some, check

## Push

- Push changes to master
- Push changes to main
- Wait for all automated checks! (All checks have passed...)

## Create Release
Expand All @@ -219,7 +219,7 @@ In case dependencies have changed, or just to update some, check

## Should automatically release to [PyPI](https://pypi.org/project/tdvisu/)

- For details see: [Upload Python Package](https://github.com/VaeterchenFrost/tdvisu/blob/master/.github/workflows/python-publish.yml)
- For details see: [Upload Python Package](https://github.com/VaeterchenFrost/tdvisu/blob/main/.github/workflows/python-publish.yml)

**Now you are set for the new release :tada:**

Expand Down
2 changes: 1 addition & 1 deletion TDVisu.schema.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://raw.githubusercontent.com/VaeterchenFrost/tdvisu/master/TDVisu.schema.json",
"$id": "https://raw.githubusercontent.com/VaeterchenFrost/tdvisu/main/TDVisu.schema.json",
"type": "object",
"title": "The root schema for TDVisu",
"description": "The schema describes the valid JSON input for visualizing dynamic programming on tree-decompositions in TDVisu.",
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_directory_md.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from typing import Iterator
from urllib.parse import quote

URL_BASE = "https://github.com/VaeterchenFrost/tdvisu/blob/master"
URL_BASE = "https://github.com/VaeterchenFrost/tdvisu/blob/main"

AFFECTED_EXT = (
".py",
Expand Down

0 comments on commit 461204b

Please sign in to comment.