diff --git a/.gitignore b/.gitignore index d0ad06f..d892a65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -Лаба1 -Лаба2 -Лаба3 +Лаба1/ +Лаба2/ +Лаба3/ +Лаба456/ # ---> MicrosoftOffice *.tmp diff --git a/Лаба456/lab4 b/Лаба456/lab4 deleted file mode 160000 index f2d8f5c..0000000 --- a/Лаба456/lab4 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f2d8f5c05ecf7ea69fb81da641368a174a010fd7 diff --git a/Лаба456/lab5 b/Лаба456/lab5 deleted file mode 160000 index adacfe2..0000000 --- a/Лаба456/lab5 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit adacfe2ac9163460d10ac8e2236f92a69e885cac diff --git a/Лаба456/lab6 b/Лаба456/lab6 deleted file mode 160000 index 27ed2e6..0000000 --- a/Лаба456/lab6 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 27ed2e6823144a0800f13a77283e56fb92d01abb diff --git a/ОИТ Практическая 1.docx b/Практическая 1/ОИТ Практическая 1.docx similarity index 100% rename from ОИТ Практическая 1.docx rename to Практическая 1/ОИТ Практическая 1.docx diff --git a/ОИТ. Лекция 01.pptx b/Практическая 1/ОИТ. Лекция 01.pptx similarity index 100% rename from ОИТ. Лекция 01.pptx rename to Практическая 1/ОИТ. Лекция 01.pptx diff --git a/Практическая работа 1. Количественный и качественный анализ информации.doc b/Практическая 1/Практическая работа 1. Количественный и качественный анализ информации.doc similarity index 100% rename from Практическая работа 1. Количественный и качественный анализ информации.doc rename to Практическая 1/Практическая работа 1. Количественный и качественный анализ информации.doc diff --git a/Практическая 2/IMG20241106190931.jpg b/Практическая 2/IMG20241106190931.jpg new file mode 100644 index 0000000..d828649 Binary files /dev/null and b/Практическая 2/IMG20241106190931.jpg differ diff --git a/Практическая 2/IMG20241106190931.jpg.xmp b/Практическая 2/IMG20241106190931.jpg.xmp new file mode 100644 index 0000000..d03322d --- /dev/null +++ b/Практическая 2/IMG20241106190931.jpg.xmp @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Практическая 2/IMG20241106190931.png b/Практическая 2/IMG20241106190931.png new file mode 100644 index 0000000..98e0957 Binary files /dev/null and b/Практическая 2/IMG20241106190931.png differ diff --git a/Практическая 2/IMG20241106190943.jpg b/Практическая 2/IMG20241106190943.jpg new file mode 100644 index 0000000..cdb16e3 Binary files /dev/null and b/Практическая 2/IMG20241106190943.jpg differ diff --git a/Практическая 2/IMG20241106190943.jpg.xmp b/Практическая 2/IMG20241106190943.jpg.xmp new file mode 100644 index 0000000..5c68796 --- /dev/null +++ b/Практическая 2/IMG20241106190943.jpg.xmp @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Практическая 2/IMG20241106190943.png b/Практическая 2/IMG20241106190943.png new file mode 100644 index 0000000..e421c35 Binary files /dev/null and b/Практическая 2/IMG20241106190943.png differ diff --git a/Практическая 2/conversions/conversions.sln b/Практическая 2/conversions/conversions.sln new file mode 100644 index 0000000..5111a78 --- /dev/null +++ b/Практическая 2/conversions/conversions.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35222.181 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conversions", "conversions.vcxproj", "{D7D3694E-189B-4AA9-AE3C-CEC7985C856B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Debug|x64.ActiveCfg = Debug|x64 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Debug|x64.Build.0 = Debug|x64 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Debug|x86.ActiveCfg = Debug|Win32 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Debug|x86.Build.0 = Debug|Win32 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Release|x64.ActiveCfg = Release|x64 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Release|x64.Build.0 = Release|x64 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Release|x86.ActiveCfg = Release|Win32 + {D7D3694E-189B-4AA9-AE3C-CEC7985C856B}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {78048FC0-18B8-440A-B1D2-DFFD10408223} + EndGlobalSection +EndGlobal diff --git a/Практическая 2/conversions/conversions.vcxproj b/Практическая 2/conversions/conversions.vcxproj new file mode 100644 index 0000000..d636fc6 --- /dev/null +++ b/Практическая 2/conversions/conversions.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {d7d3694e-189b-4aa9-ae3c-cec7985c856b} + conversions + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/Практическая 2/conversions/conversions.vcxproj.filters b/Практическая 2/conversions/conversions.vcxproj.filters new file mode 100644 index 0000000..669bc4e --- /dev/null +++ b/Практическая 2/conversions/conversions.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Исходные файлы + + + \ No newline at end of file diff --git a/Практическая 2/conversions/main.c b/Практическая 2/conversions/main.c new file mode 100644 index 0000000..3844d83 --- /dev/null +++ b/Практическая 2/conversions/main.c @@ -0,0 +1,15 @@ +#include +#include + +int main() { + double n = 0.33; + double sum = 0; + int base = 8; + for (int i = 0; i < 10; i++) { + printf_s("%d", (int)(n * base)); + sum += (int)(n * base) * pow(base, -1 - i); + n = n * base - (int)(n * base); + } + printf_s("\n%lf", sum); + return 0; +} \ No newline at end of file diff --git a/Практическая 2/ОИТ Практическая 2.docx b/Практическая 2/ОИТ Практическая 2.docx new file mode 100644 index 0000000..cb103ac Binary files /dev/null and b/Практическая 2/ОИТ Практическая 2.docx differ diff --git a/Практическая 2/ОИТ. Лекция 02.pptx b/Практическая 2/ОИТ. Лекция 02.pptx new file mode 100644 index 0000000..9e97bcd Binary files /dev/null and b/Практическая 2/ОИТ. Лекция 02.pptx differ diff --git a/Практическая 2/Практическая работа 2. Системы счисления.doc b/Практическая 2/Практическая работа 2. Системы счисления.doc new file mode 100644 index 0000000..1a8b6a8 Binary files /dev/null and b/Практическая 2/Практическая работа 2. Системы счисления.doc differ diff --git a/Практическая 3/ОИТ. Лекция 03.pptx b/Практическая 3/ОИТ. Лекция 03.pptx new file mode 100644 index 0000000..7d4aabc Binary files /dev/null and b/Практическая 3/ОИТ. Лекция 03.pptx differ diff --git a/Практическая 3/Практическая работа 3. Основы алгебры логики.doc b/Практическая 3/Практическая работа 3. Основы алгебры логики.doc new file mode 100644 index 0000000..ea40ac8 Binary files /dev/null and b/Практическая 3/Практическая работа 3. Основы алгебры логики.doc differ diff --git a/Практическая 4/ОИТ. Лекция 04.pptx b/Практическая 4/ОИТ. Лекция 04.pptx new file mode 100644 index 0000000..ab9e5c0 Binary files /dev/null and b/Практическая 4/ОИТ. Лекция 04.pptx differ