Skip to content

Commit

Permalink
Merge branch 'dev' to release v0.10.0
Browse files Browse the repository at this point in the history
Signed-off-by: Certseeds <[email protected]>
  • Loading branch information
Certseeds committed Mar 30, 2023
2 parents 3fdd109 + 80b9a20 commit 5079548
Show file tree
Hide file tree
Showing 906 changed files with 2,138 additions and 2,058 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
charset = utf-8
indent_style = space
insert_final_newline = true

[*.{cpp,hpp}]
end_of_line = lf
indent_size = 4
trim_trailing_whitespace = true
5 changes: 2 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
###
# @Github: https://github.com/Certseeds/leetcode
# @Organization: SUSTech
# @Github: https://github.com/Certseeds/CS203_DSAA_template
# @Author: nanoseeds
# @Date: 2020-07-15 23:48:29
# @LastEditors: nanoseeds
Expand Down Expand Up @@ -135,4 +134,4 @@
*.xproj text eol=crlf
*.props text eol=crlf
*.filters text eol=crlf
*.vcxitems text eol=crlf
*.vcxitems text eol=crlf
13 changes: 2 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
<!--
* @Github: https://github.com/Certseeds/CS203_DSAA_template
* @Author: nanoseeds
* @Date: 2020-07-26 16:34:11
* @LastEditors: nanoseeds
* @LastEditTime: 2020-07-26 16:35:14
* @License: CC-BY-NC-SA_V4_0 or any later version
-->

# Contributing

欢迎向本Project贡献代码.

请确认本Project使用的MIT协议与CC-BY-NC-SA-4.0(or any later version)协议符合预期.
请确认本Project使用的AGPLV3+协议与CC-BY-NC-SA-4.0(or any later version)协议符合预期.

## What we want to Contribute

Expand All @@ -37,4 +28,4 @@ Here are a few things you can do that will increase the likelihood of your pull

- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
- [GitHub Help](https://help.github.com)
- [GitHub Help](https://help.github.com)
20 changes: 20 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Security Policy

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.

| Version | Supported |
|---------|------------|
| 0.9.x | supporting |

## Reporting a Vulnerability

> Use this section to tell people how to report a vulnerability.
> Tell them where to go, how often they can expect to get an update on a
> reported vulnerability, what to expect if the vulnerability is accepted or
> declined, etc.
just post something in issue.
3 changes: 1 addition & 2 deletions .github/workflows/rust_build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# @Organization: SUSTech
# @Author: nanoseeds
# @Date: 2020-07-28 22:43:03
# @LastEditors: nanoseeds
#@LastEditTime: 2020-07-28 23:43:03
# @LastEditTime: 2020-07-28 23:43:03
# This is a basic workflow to help you get started with Actions

name: Rust Build and Test
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
###
## @Github: https://github.com/Certseeds/leetcode_cpp
## @Organization: SUSTech
## @Github: https://github.com/Certseeds/CS203_DSAA_template
## @Author: nanoseeds
## @Date: 2020-07-15 23:48:29
## @LastEditors: nanoseeds
Expand Down Expand Up @@ -341,4 +340,4 @@ fabric.properties
*.a
*.o
*.so
*.exe
*.exe
4 changes: 2 additions & 2 deletions .idea/fileTemplates/includes/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/includes/FILE_HEAD_CPP.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/fileTemplates/includes/FILE_HEAD_PY.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/fileTemplates/includes/LICENSE_AGPL_CPP.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/fileTemplates/includes/LICENSE_AGPL_PY.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions .idea/fileTemplates/includes/LICENSE_MIT_CPP.h

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/fileTemplates/includes/LICENSE_MIT_PY.py

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/C Header File.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/C Source File.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/C++ Class Header.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/C++ Class.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/Python Script.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/fileTemplates/internal/Python Unit Test.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.16.6)

set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 9)
set(PROJECT_VERSION_PATCH 2) # delete endsWith strs when master merge dev
set(PROJECT_VERSION_MINOR 10)
set(PROJECT_VERSION_PATCH 0) # delete endsWith strs when master merge dev

project(CS203_DSAA_template
DESCRIPTION "Template for Algorithm Based on C++11 and Modern CMake"
Expand Down
15 changes: 0 additions & 15 deletions LICENSE_MIT.md

This file was deleted.

22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="top"></div>

[![MIT License][MIT-shield]][MIT_Link]
[![AGPL License][AGPL-shield]][AGPL_Link]
[![CC BY-NC-SA 4.0][cc_by_nc_sa_4_0_shield]][cc_by_nc_sa_4_0]
[![CC BY-NC-SA 4.0][cc_by_nc_sa_4_0_image]][cc_by_nc_sa_4_0]

Expand Down Expand Up @@ -72,6 +72,7 @@ OJ系统存在着一些特殊要求-因此考虑到下面的因素,设计了一

## Getting Started


1. 下载Release中的[压缩包][download_zip]或者[另一个压缩包][download_zip_refs],之后解压使用(简易)
2. 使用绿色按钮[Use This Template][Use_This_Template],生成仓库,clone下来使用(推荐)
3. fork this repo,clone下来使用(不推荐,fork的仓库只有合入主仓库才被github计入提交图)
Expand Down Expand Up @@ -333,17 +334,12 @@ Don't forget to give the project a star! Thanks again!

## License

### MIT LICENSE

绝大多数代码(`*.cpp`,`*.hpp`,etc)基于MIT协议: 限制最少的主流开源协议

+ 在署名的前提下,
+ 允许他人以任何方式使用,
+ 同时原作者不承担任何风险.
+ 具体内容请看[`LICENSE_MIT.md`](./LICENSE_MIT.md)

### AGPLv3.0+ LICENSE

绝大多数代码(`*.cpp`,`*.hpp`,etc)基于 AGPLv3.0+协议: 限制最强的主流开源协议

+ 由于本仓库设计只包括"上交"源码这一种场景, 因此实际上不存在二进制分发以及被云服务使用这种场景.
+ 具体内容请看[`LICENSE_AGPL_V3_0.md`](./LICENSE_AGPL_V3_0.md)
some code is based on this license

### CC-BY-NC-SA-4.0+ LICENSE
Expand Down Expand Up @@ -394,8 +390,8 @@ Use this space to list resources you find helpful and would like to give credit
[pr_LINK]: https://github.com/Certseeds/CS203_DSAA_template/pulls
[discussion_LINK]: https://github.com/Certseeds/CS203_DSAA_template/discussions
[catch2_image]: https://raw.githubusercontent.com/catchorg/Catch2/v2.x/artwork/catch2-logo-small.png
[MIT-shield]: https://img.shields.io/badge/License-MIT-orange?style=for-the-badge
[MIT_Link]: http://opensource.org/licenses/MIT
[AGPL-shield]: https://img.shields.io/badge/License-AGPL-orange?style=for-the-badge
[AGPL_Link]: http://opensource.org/licenses/AGPL
[cc_by_nc_sa_4_0_shield]: https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-orange?style=for-the-badge
[cc_by_nc_sa_4_0]: https://creativecommons.org/licenses/by-nc-sa/4.0/
[cc_by_nc_sa_4_0_image]: https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png
Expand All @@ -412,4 +408,4 @@ Use this space to list resources you find helpful and would like to give credit
[release-shield]: https://img.shields.io/github/release/Certseeds/CS203_DSAA_template.svg?style=for-the-badge
[release-url]: https://github.com/Certseeds/CS203_DSAA_template/releases
[GitHub-Whexy]: https://github.com/whexy
[Two-Night-Online-Judge]: https://www.whexy.com/posts/wannaAC
[Two-Night-Online-Judge]: https://www.whexy.com/posts/wannaAC
2 changes: 1 addition & 1 deletion algorithm/2020S/20200415/20200415.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/

#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions algorithm/2020S/20200426/20200426_1st.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/
#include <cstdint>
#include <iostream>
Expand Down Expand Up @@ -57,4 +57,4 @@ int32_t main() {
}
}
return 0;
}
}
4 changes: 2 additions & 2 deletions algorithm/2020S/20200426/20200426_3rd.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/
#include <cstdint>
#include <vector>
Expand Down Expand Up @@ -54,4 +54,4 @@ int32_t main() {
}
printf("%.3f", std::sqrt(min_value));
return 0;
}
}
2 changes: 1 addition & 1 deletion algorithm/2020S/20200426/20200426_4th.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/
#include <cstdint>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion algorithm/2020S/20200426/20200426_5th.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/
#include <cstdint>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion algorithm/2020S/20200511/20200511_4th.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
/* CS203_DSAA_template
Copyright (C) 2020-2022 nanoseeds
Copyright (C) 2020-2023 nanoseeds
*/

#include <string>
Expand Down
Loading

0 comments on commit 5079548

Please sign in to comment.