diff --git a/docs/.buildinfo b/docs/.buildinfo index 0cd8977d..23c9fe6a 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 2e0636f7fc3e8adaa89570459f349074 +config: 480ec18c991952c5848edd35dd1b33c1 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_images/monitoring.storage.png b/docs/_images/monitoring.storage.png index ee78dc76..681b991b 100644 Binary files a/docs/_images/monitoring.storage.png and b/docs/_images/monitoring.storage.png differ diff --git a/docs/_images/plot.candle.png b/docs/_images/plot.candle.png index 0467c20a..096dea9b 100644 Binary files a/docs/_images/plot.candle.png and b/docs/_images/plot.candle.png differ diff --git a/docs/_images/plot.hist.png b/docs/_images/plot.hist.png index ab59cb8d..58a1e40b 100644 Binary files a/docs/_images/plot.hist.png and b/docs/_images/plot.hist.png differ diff --git a/docs/_images/plot.pie.png b/docs/_images/plot.pie.png index f44e3ca0..391a6be0 100644 Binary files a/docs/_images/plot.pie.png and b/docs/_images/plot.pie.png differ diff --git a/docs/_images/plot.plot.1.png b/docs/_images/plot.plot.1.png index a02e984a..3d0a07c7 100644 Binary files a/docs/_images/plot.plot.1.png and b/docs/_images/plot.plot.1.png differ diff --git a/docs/_images/plot.plot.2.png b/docs/_images/plot.plot.2.png index ded38200..18340101 100644 Binary files a/docs/_images/plot.plot.2.png and b/docs/_images/plot.plot.2.png differ diff --git a/docs/_images/plot.scatter.png b/docs/_images/plot.scatter.png index 78f6486d..ab68e97c 100644 Binary files a/docs/_images/plot.scatter.png and b/docs/_images/plot.scatter.png differ diff --git a/docs/_images/quant.bollinger_bands.png b/docs/_images/quant.bollinger_bands.png index 4609aa6b..6f626ecf 100644 Binary files a/docs/_images/quant.bollinger_bands.png and b/docs/_images/quant.bollinger_bands.png differ diff --git a/docs/_images/quant.macd.png b/docs/_images/quant.macd.png index 2e23cf1f..37539b28 100644 Binary files a/docs/_images/quant.macd.png and b/docs/_images/quant.macd.png differ diff --git a/docs/_images/quant.momentum.png b/docs/_images/quant.momentum.png index 8f846c2a..bb3a408f 100644 Binary files a/docs/_images/quant.momentum.png and b/docs/_images/quant.momentum.png differ diff --git a/docs/_images/quant.moving_average.png b/docs/_images/quant.moving_average.png index 7c30729d..f1af9191 100644 Binary files a/docs/_images/quant.moving_average.png and b/docs/_images/quant.moving_average.png differ diff --git a/docs/_images/quant.rsi.png b/docs/_images/quant.rsi.png index fd6b3af4..36d46fd8 100644 Binary files a/docs/_images/quant.rsi.png and b/docs/_images/quant.rsi.png differ diff --git a/docs/_images/vision.grid.png b/docs/_images/vision.grid.png index b33446e2..297c833b 100644 Binary files a/docs/_images/vision.grid.png and b/docs/_images/vision.grid.png differ diff --git a/docs/_images/vision.mask.png b/docs/_images/vision.mask.png index 41508b60..b44105b5 100644 Binary files a/docs/_images/vision.mask.png and b/docs/_images/vision.mask.png differ diff --git a/docs/_images/vision.poly2mask.png b/docs/_images/vision.poly2mask.png deleted file mode 100644 index ed48cf59..00000000 Binary files a/docs/_images/vision.poly2mask.png and /dev/null differ diff --git a/docs/_images/vision.vert.png b/docs/_images/vision.vert.png index 450f4652..12c7d51e 100644 Binary files a/docs/_images/vision.vert.png and b/docs/_images/vision.vert.png differ diff --git a/docs/_sources/cicd.md.txt b/docs/_sources/cicd.md.txt index f0f05ea5..7b5beb41 100644 --- a/docs/_sources/cicd.md.txt +++ b/docs/_sources/cicd.md.txt @@ -3,25 +3,10 @@ ```{admonition} Used Stacks :class: important -1. Jenkins (Black, flake8, Pylint, Setuptools, PyTest, Sphinx) -2. GitHub Actions +GitHub Actions (Black, flake8, Pylint, Setuptools, PyTest, Sphinx) ``` -## Jenkins - -
- -
- -|Stage|Condition| -|:-:|-| -|1. `Setup`|⭕ [`*` Push]| -|2. `Merge From Docs`|⭕ [`*` Push] "Merge pull request\*/docs"⭕ [`*` Push] "Merge pull request*[Docs] Build by Sphinx for GitHub Pages"| -|3. `1. Lint`|⭕ [`dev*` Push]- +
1. `dev-*` push - 1. `Setup`: Commit message parsing - 2. `1. Lint`: Check format of python codes - 3. `2. Build`: Install dependencies & build package - 4. `3. Test`: Do PyTest + 1. `check-pr`: Check if a PR is open for the `dev-*` branch + 2. `build`: Install dependencies & build package + 3. `lint`: Check format of python codes + 4. `test`: Do PyTest 2. `dev-*` → `master` - 1. `Setup`: Commit message parsing - 2. `1. Lint`: Check format of python codes - 3. `2. Build`: Install dependencies & build package - 4. `3. Test`: Do PyTest - 5. `4. Docs`: Create PR (`docs` → `dev-*`) including the build results generated by Sphinx - 6. `Merge From Docs`: If merge PR from `docs`, can merge `dev-*` → `master` + 1. `check-commit`: Commit message parsing + 2. `build`: Install dependencies & build package + 3. `lint`: Check format of python codes + 4. `test`: Do PyTest + 5. `docs`: Create PR (`docs` → `dev-*`) including the build results generated by Sphinx + 6. `merge-from-docs`: If merge PR from `docs`, can merge `dev-*` → `master` 3. `master` push - 1. `Setup`: Commit message parsing - 2. `2. Build`: Install dependencies & build package - 3. `Deploy` + 1. `build`: Install dependencies & build package + 2. `deploy` 1. `GitHub`: Deploy to GitHub 2. `PyPI`: Deploy to PyPI @@ -63,24 +47,20 @@ The `chore` branch is utilized when the build result is not different, but there ```- +
1. `chore-*` push - 1. `Setup`: Commit message parsing 2. `chore-*` → `master` - 1. `Setup`: Commit message parsing - 2. `1. Lint`: Check format of python codes - 3. `2. Build`: Install dependencies & build package - 4. `3. Test`: Do PyTest - 5. `4. Docs`: Create PR (`docs` → `chore-*`) including the build results generated by Sphinx - 6. `Merge From Docs`: If merge PR from `docs`, can merge `chore-*` → `master` + 1. `check-commit`: Commit message parsing + 2. `build`: Install dependencies & build package + 3. `lint`: Check format of python codes + 4. `test`: Do PyTest + 5. `docs`: Create PR (`docs` → `dev-*`) including the build results generated by Sphinx + 6. `merge-from-docs`: If merge PR from `docs`, can merge `dev-*` → `master` 3. `master` push - 1. `Setup`: Commit message parsing -## GitHub Actions - -### Managing Labels for Issues and Pull Requests in GitHub +## Managing Labels for Issues and Pull Requests in GitHub + [Issue](https://github.com/Zerohertz/zerohertzLib/blob/master/.github/workflows/issue-controller.yaml) + `assignees: ['Zerohertz']` @@ -104,7 +84,7 @@ The `chore` branch is utilized when the build result is not different, but there + `baseBranch.startsWith('dev') || baseBranch.startsWith('chore')) && headBranch === 'docs'` + `labelsToAdd.push('docs')` -### Sphinx Documentation Deployment +## Sphinx Documentation Deployment ```{admonition} Sphinx Documentation :class: note @@ -115,3 +95,89 @@ Documents created and built using Sphinx are deployed via GitHub Actions and Git+ +--- + +
+ +
+ ++ +
+ +1. `dev-*` push + 1. `Setup`: Commit message parsing + 2. `1. Lint`: Check format of python codes + 3. `2. Build`: Install dependencies & build package + 4. `3. Test`: Do PyTest +2. `dev-*` → `master` + 1. `Setup`: Commit message parsing + 2. `1. Lint`: Check format of python codes + 3. `2. Build`: Install dependencies & build package + 4. `3. Test`: Do PyTest + 5. `4. Docs`: Create PR (`docs` → `dev-*`) including the build results generated by Sphinx + 6. `Merge From Docs`: If merge PR from `docs`, can merge `dev-*` → `master` +3. `master` push + 1. `Setup`: Commit message parsing + 2. `2. Build`: Install dependencies & build package + 3. `Deploy` + 1. `GitHub`: Deploy to GitHub + 2. `PyPI`: Deploy to PyPI + ++ +
+ +1. `chore-*` push + 1. `Setup`: Commit message parsing +2. `chore-*` → `master` + 1. `Setup`: Commit message parsing + 2. `1. Lint`: Check format of python codes + 3. `2. Build`: Install dependencies & build package + 4. `3. Test`: Do PyTest + 5. `4. Docs`: Create PR (`docs` → `chore-*`) including the build results generated by Sphinx + 6. `Merge From Docs`: If merge PR from `docs`, can merge `chore-*` → `master` +3. `master` push + 1. `Setup`: Commit message parsing + +>>> cls = [i for i in range(cnt)]
->>> class_list = [cls[random.randint(0, 2)] for _ in range(cnt)]
+>>> class_list = [cls[random.randint(0, 5)] for _ in range(cnt)]
>>> class_color = {}
>>> for c in cls:
>>> class_color[c] = [random.randint(0, 255) for _ in range(3)]
@@ -1387,11 +1387,16 @@
>>> poly = np.array([[100, 400], [400, 400], [800, 900], [400, 1100], [100, 800]])
+
>>> poly = np.array([[100, 400], [400, 400], [800, 900], [400, 1100], [100, 800]])
>>> res3 = zz.vision.mask(img, poly=poly)
>>> poly = zz.vision.xyxy2poly(zz.vision.poly2xyxy((np.random.rand(cnt, 4, 2) * (W, H))))
+>>> res4 = zz.vision.mask(img, poly=poly, class_list=class_list, class_color=class_color)
+
target
image를 img
위에 투명도를 포함하여 병합
Note
@@ -1564,7 +1569,7 @@다각형의 면적을 산출하는 함수
다각형 좌표를 입력받아 mask로 변환
시각화 결과 ([H, W, C]
)
변환된 mask ([H, W]
or [N, H, W]
)
NDArray[bool]
Examples
>>> poly = [[10, 10], [20, 10], [30, 40], [20, 60], [10, 20]]
->>> mask = zz.vision.poly2mask(poly, (70, 100))
->>> mask.shape
+>>> mask1 = zz.vision.poly2mask(poly, (70, 100))
+>>> mask1.shape
(70, 100)
->>> mask.dtype
+>>> mask1.dtype
+dtype('bool')
+>>> poly = np.array(poly)
+>>> mask2 = zz.vision.poly2mask([poly, poly - 10, poly + 20], (70, 100))
+>>> mask2.shape
+(3, 70, 100)
+>>> mask2.dtype
dtype('bool')