diff --git a/1Y-2H/dsa/lab2/.o/main.o b/1Y-2H/dsa/lab2/.o/main.o index bcd5359..003cdce 100644 Binary files a/1Y-2H/dsa/lab2/.o/main.o and b/1Y-2H/dsa/lab2/.o/main.o differ diff --git a/1Y-2H/dsa/lab2/code/main.c b/1Y-2H/dsa/lab2/code/main.c index 1d6020d..dbf41da 100644 --- a/1Y-2H/dsa/lab2/code/main.c +++ b/1Y-2H/dsa/lab2/code/main.c @@ -68,8 +68,8 @@ void run_exp(void) { fprintf(f, "# N Radix Heap Bubble \n"); - int n = 50000,end=MILLION,step = n; - for (;n0 для логарифма +set ytics 4 + +set xrange [50:1000] +set xtics 50 + +plot 'table-.dat' using ($1/1000):2 with lp pt 9 ps 1 lw 2 lc rgb "red" title "Radix", \ + 'table-.dat' using ($1/1000):3 with lp pt 7 ps 1 lw 2 lc rgb "blue" title "Heap", \ + 'table-.dat' using ($1/1000):4 with lp pt 5 ps 1 lw 2 lc rgb "#00CC00" title "Bubble" + +unset multiplot diff --git a/1Y-2H/dsa/lab2/data/result_dual.png b/1Y-2H/dsa/lab2/data/result_dual.png new file mode 100644 index 0000000..3c4888d Binary files /dev/null and b/1Y-2H/dsa/lab2/data/result_dual.png differ diff --git a/1Y-2H/dsa/lab2/data/sort b/1Y-2H/dsa/lab2/data/sort index 18406cf..fbbcd33 100755 Binary files a/1Y-2H/dsa/lab2/data/sort and b/1Y-2H/dsa/lab2/data/sort differ diff --git a/1Y-2H/dsa/lab2/data/table-.dat b/1Y-2H/dsa/lab2/data/table-.dat new file mode 100644 index 0000000..7ef2f1d --- /dev/null +++ b/1Y-2H/dsa/lab2/data/table-.dat @@ -0,0 +1,21 @@ +# N Radix Heap Bubble +50000 0.005061 0.012689 6.092187 +100000 0.008732 0.029754 40.427205 +150000 0.022931 0.084427 99.451828 +200000 0.028459 0.115050 178.078532 +250000 0.036596 0.146176 256.123327 +300000 0.026082 0.114544 364.379254 +350000 0.028501 0.127360 455.556741 +400000 0.055024 0.239221 500.093542 +450000 0.035013 0.140892 747.245884 +500000 0.084967 0.384743 1048.285032 +550000 0.068909 0.252855 1164.834164 +600000 0.087081 0.428985 1515.998724 +650000 0.070355 0.322971 1608.263957 +700000 0.070045 0.332604 1883.855704 +750000 0.069788 0.326656 2177.522349 +800000 0.088207 0.456468 1850.703608 +850000 0.064560 0.277249 2044.421354 +900000 0.086789 0.443723 2273.636972 +950000 0.096368 0.382605 2464.046742 +1000000 0.068228 0.352989 2893.217010 diff --git a/1Y-2H/dsa/lab2/data/table.dat b/1Y-2H/dsa/lab2/data/table.dat index e69de29..81438a9 100644 --- a/1Y-2H/dsa/lab2/data/table.dat +++ b/1Y-2H/dsa/lab2/data/table.dat @@ -0,0 +1,20 @@ +# N Radix Heap Bubble +50000 0.005061 0.012689 6.092187 +100000 0.008732 0.029754 40.427205 +150000 0.022931 0.084427 99.451828 +200000 0.028459 0.115050 178.078532 +250000 0.036596 0.146176 256.123327 +300000 0.026082 0.114544 364.379254 +350000 0.028501 0.127360 455.556741 +400000 0.055024 0.239221 500.093542 +450000 0.035013 0.140892 747.245884 +500000 0.084967 0.384743 1048.285032 +550000 0.068909 0.252855 1164.834164 +600000 0.087081 0.428985 1515.998724 +650000 0.070355 0.322971 1608.263957 +700000 0.070045 0.332604 1883.855704 +750000 0.069788 0.326656 2177.522349 +800000 0.088207 0.456468 1850.703608 +850000 0.064560 0.277249 2044.421354 +900000 0.086789 0.443723 2273.636972 +950000 0.096368 0.382605 2464.046742 diff --git a/1Y-2H/gameoflife b/1Y-2H/gameoflife new file mode 160000 index 0000000..feb40df --- /dev/null +++ b/1Y-2H/gameoflife @@ -0,0 +1 @@ +Subproject commit feb40df734fc63b76ab7843e0a87417243f43cee diff --git a/1Y-2H/prog/1Practice/var2/code/head.h b/1Y-2H/prog/1Practice/code/head.h similarity index 100% rename from 1Y-2H/prog/1Practice/var2/code/head.h rename to 1Y-2H/prog/1Practice/code/head.h diff --git a/1Y-2H/prog/1Practice/var2/code/io.c b/1Y-2H/prog/1Practice/code/io.c similarity index 100% rename from 1Y-2H/prog/1Practice/var2/code/io.c rename to 1Y-2H/prog/1Practice/code/io.c diff --git a/1Y-2H/prog/1Practice/var2/code/main.c b/1Y-2H/prog/1Practice/code/main.c similarity index 100% rename from 1Y-2H/prog/1Practice/var2/code/main.c rename to 1Y-2H/prog/1Practice/code/main.c diff --git a/1Y-2H/prog/1Practice/var2/code/matrix.c b/1Y-2H/prog/1Practice/code/matrix.c similarity index 100% rename from 1Y-2H/prog/1Practice/var2/code/matrix.c rename to 1Y-2H/prog/1Practice/code/matrix.c diff --git a/1Y-2H/prog/1Practice/var2/docs.md b/1Y-2H/prog/1Practice/docs.md similarity index 100% rename from 1Y-2H/prog/1Practice/var2/docs.md rename to 1Y-2H/prog/1Practice/docs.md diff --git a/1Y-2H/prog/1Practice/var2/run/input b/1Y-2H/prog/1Practice/run/input similarity index 100% rename from 1Y-2H/prog/1Practice/var2/run/input rename to 1Y-2H/prog/1Practice/run/input diff --git a/1Y-2H/prog/1Practice/var2/run/makefile b/1Y-2H/prog/1Practice/run/makefile similarity index 100% rename from 1Y-2H/prog/1Practice/var2/run/makefile rename to 1Y-2H/prog/1Practice/run/makefile diff --git a/1Y-2H/prog/1Practice/var2/run/matrix b/1Y-2H/prog/1Practice/run/matrix similarity index 100% rename from 1Y-2H/prog/1Practice/var2/run/matrix rename to 1Y-2H/prog/1Practice/run/matrix diff --git a/1Y-2H/prog/1Practice/Практическая работа 1.pdf b/1Y-2H/prog/1Practice/Практическая работа 1.pdf new file mode 100644 index 0000000..a759c6d Binary files /dev/null and b/1Y-2H/prog/1Practice/Практическая работа 1.pdf differ diff --git a/1Y-2H/trpo/done/.clang-format b/1Y-2H/trpo/done/.clang-format deleted file mode 100644 index 0bc5a63..0000000 --- a/1Y-2H/trpo/done/.clang-format +++ /dev/null @@ -1,86 +0,0 @@ ---- -Language: Cpp -AccessModifierOffset: -4 -AlignAfterOpenBracket: AlwaysBreak -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlines: Left -AlignOperands: false -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: true -BinPackArguments: false -BinPackParameters: false -BraceWrapping: - AfterClass: false - AfterControlStatement: false - AfterEnum: false - AfterFunction: true - AfterNamespace: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakBeforeBinaryOperators: All -BreakBeforeBraces: Custom -BreakBeforeInheritanceComma: false -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakConstructorInitializers: BeforeColon -BreakStringLiterals: true -ColumnLimit: 80 -CompactNamespaces: true -ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 8 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: false -IncludeBlocks: Preserve -IndentCaseLabels: false -IndentPPDirectives: None -IndentWidth: 4 -IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: false -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -PenaltyBreakAssignment: 2 -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Left -ReflowComments: true -SortIncludes: true -SortUsingDeclarations: true -SpaceAfterCStyleCast: false -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 1 -SpacesInAngles: false -SpacesInContainerLiterals: false -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Cpp11 -TabWidth: 8 -UseTab: Never -... - diff --git a/1Y-2H/trpo/done/.o/chessviz/io.o b/1Y-2H/trpo/done/.o/chessviz/io.o deleted file mode 100644 index b4f7e25..0000000 Binary files a/1Y-2H/trpo/done/.o/chessviz/io.o and /dev/null differ diff --git a/1Y-2H/trpo/done/.o/chessviz/logic.o b/1Y-2H/trpo/done/.o/chessviz/logic.o deleted file mode 100644 index 48f96d9..0000000 Binary files a/1Y-2H/trpo/done/.o/chessviz/logic.o and /dev/null differ diff --git a/1Y-2H/trpo/done/.o/chessviz/main.o b/1Y-2H/trpo/done/.o/chessviz/main.o deleted file mode 100644 index b08dddd..0000000 Binary files a/1Y-2H/trpo/done/.o/chessviz/main.o and /dev/null differ diff --git a/1Y-2H/trpo/done/README.md b/1Y-2H/trpo/done/README.md deleted file mode 100644 index e0a1951..0000000 --- a/1Y-2H/trpo/done/README.md +++ /dev/null @@ -1,93 +0,0 @@ -# lab-rodionov-iv522s18 - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -* [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -* [Add files using the command line](https://docs.gitlab.com/topics/git/add_files/#add-files-to-a-git-repository) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://git.csc.sibsutis.ru/trpo2026/lab-rodionov-iv522s18.git -git branch -M master -git push -uf origin master -``` - -## Integrate with your tools - -* [Set up project integrations](https://git.csc.sibsutis.ru/trpo2026/lab-rodionov-iv522s18/-/settings/integrations) - -## Collaborate with your team - -* [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -* [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -* [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -* [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -* [Set auto-merge](https://docs.gitlab.com/user/project/merge_requests/auto_merge/) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -* [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/) -* [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -* [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -* [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -* [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README - -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. diff --git a/1Y-2H/trpo/done/run/chess_bin b/1Y-2H/trpo/done/run/chess_bin deleted file mode 100755 index 832c75c..0000000 Binary files a/1Y-2H/trpo/done/run/chess_bin and /dev/null differ diff --git a/1Y-2H/trpo/lab-rodionov-iv522s18 b/1Y-2H/trpo/lab-rodionov-iv522s18 index 5553e13..35320e1 160000 --- a/1Y-2H/trpo/lab-rodionov-iv522s18 +++ b/1Y-2H/trpo/lab-rodionov-iv522s18 @@ -1 +1 @@ -Subproject commit 5553e1330f06b6d49f885dd06be7b4b2dc37f44b +Subproject commit 35320e1cfbb6861721b75c1659d04e047b8497b3 diff --git a/1Y-2H/trpo/merge/1-merge-ff b/1Y-2H/trpo/merge/1-merge-ff new file mode 160000 index 0000000..5cbd705 --- /dev/null +++ b/1Y-2H/trpo/merge/1-merge-ff @@ -0,0 +1 @@ +Subproject commit 5cbd7054651cdebacfe04b2aab95b96a050624fe diff --git a/1Y-2H/trpo/merge/2-merge-no-ff b/1Y-2H/trpo/merge/2-merge-no-ff new file mode 160000 index 0000000..4461ba6 --- /dev/null +++ b/1Y-2H/trpo/merge/2-merge-no-ff @@ -0,0 +1 @@ +Subproject commit 4461ba6aeb82c21c630e0cf6d13c5a24a58f1609 diff --git a/1Y-2H/trpo/merge/3-merge-dirty b/1Y-2H/trpo/merge/3-merge-dirty new file mode 160000 index 0000000..9dd1208 --- /dev/null +++ b/1Y-2H/trpo/merge/3-merge-dirty @@ -0,0 +1 @@ +Subproject commit 9dd1208713873ba056c7d9967a390c7938e2becf diff --git a/1Y-2H/trpo/merge/4-rebase-no-conflict b/1Y-2H/trpo/merge/4-rebase-no-conflict new file mode 160000 index 0000000..0458f65 --- /dev/null +++ b/1Y-2H/trpo/merge/4-rebase-no-conflict @@ -0,0 +1 @@ +Subproject commit 0458f65e61693a9f3da9570d8d478654ebc843c1 diff --git a/1Y-2H/trpo/merge/5-merge-conflict-easy b/1Y-2H/trpo/merge/5-merge-conflict-easy new file mode 160000 index 0000000..7b759e5 --- /dev/null +++ b/1Y-2H/trpo/merge/5-merge-conflict-easy @@ -0,0 +1 @@ +Subproject commit 7b759e5389110c4e5122aff22134eaa521e11a05 diff --git a/1Y-2H/trpo/merge/6-rebase-conflict-easy b/1Y-2H/trpo/merge/6-rebase-conflict-easy new file mode 160000 index 0000000..c0d1d48 --- /dev/null +++ b/1Y-2H/trpo/merge/6-rebase-conflict-easy @@ -0,0 +1 @@ +Subproject commit c0d1d48901af3565c5190f1648ff0df8d78879a5 diff --git a/1Y-2H/trpo/merge/7-merge-conflict-hard b/1Y-2H/trpo/merge/7-merge-conflict-hard new file mode 160000 index 0000000..0f527de --- /dev/null +++ b/1Y-2H/trpo/merge/7-merge-conflict-hard @@ -0,0 +1 @@ +Subproject commit 0f527dec436410138463a1083de84e74dd501c0b diff --git a/1Y-2H/trpo/merge/8-rebase-conflict-hard b/1Y-2H/trpo/merge/8-rebase-conflict-hard new file mode 160000 index 0000000..f20cd7c --- /dev/null +++ b/1Y-2H/trpo/merge/8-rebase-conflict-hard @@ -0,0 +1 @@ +Subproject commit f20cd7c28ecfe626e82dca5eebc2e104d09bd772