From fece83fa1a4b09aa3b06a5bea598fcce705136df Mon Sep 17 00:00:00 2001
From: Ctrl-Tim <73001228+Ctrl-Tim@users.noreply.github.com>
Date: Sun, 10 Dec 2023 15:35:33 +0400
Subject: [PATCH] commit 2

---
 .idea/workspace.xml           | 101 ++++++++++++++++++++++++++--------
 istyukov_timofey_lab1/lab1.py |  20 ++-----
 2 files changed, 84 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f23f7a..4bd0d1c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0ceb130e-88da-4a20-aad6-17f5ab4226ac" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/IIS_2023_1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/IIS_2023_1.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="0ceb130e-88da-4a20-aad6-17f5ab4226ac" name="Changes" comment="commit 1">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/istyukov_timofey_lab1/lab1.py" beforeDir="false" afterPath="$PROJECT_DIR$/istyukov_timofey_lab1/lab1.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,29 +42,50 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;senkin__alexander__lab__1&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/ulstukek/Course4/IIS/labs&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.ide.settings.new.ui&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "senkin__alexander__lab__1",
+    "last_opened_file_path": "D:/ulstukek/Course4/IIS/labs",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.sourceCode",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\ulstukek\Course4\IIS\IISLabs\IIS_2023_1\zavrazhnova_svetlana_lab_3" />
       <recent name="D:\ulstukek\Course4\IIS\IISLabs\IIS_2023_1\zavrazhnova_svetlana_lab_1" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.zavrazhnova_svetlana_lab3_2">
+  <component name="RunManager" selected="Python.lab1">
+    <configuration name="lab1" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="IIS_2023_1" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="E:\Programms\Python\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/istyukov_timofey_lab1" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/istyukov_timofey_lab1/lab1.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="zavrazhnova_svetlana_lab3_2" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="IIS_2023_1" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -132,13 +152,19 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="Python.lab1" />
+      <item itemvalue="Python.zavrazhnova_svetlana_lab3_2" />
+      <item itemvalue="Python.zavrazhnova_svetlana_lab_2" />
+      <item itemvalue="Python.zavrazhnova_svetlana_lab_3_1" />
+    </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.lab1" />
         <item itemvalue="Python.zavrazhnova_svetlana_lab_3_1" />
         <item itemvalue="Python.zavrazhnova_svetlana_lab_2" />
         <item itemvalue="Python.zavrazhnova_svetlana_lab3_2" />
         <item itemvalue="Python.zavrazhnova_svetlana_lab3_2" />
-        <item itemvalue="Python.zavrazhnova_svetlana_lab_3_1" />
       </list>
     </recent_temporary>
   </component>
@@ -153,6 +179,14 @@
       <workItem from="1697735437405" duration="1706000" />
       <workItem from="1697740229646" duration="3802000" />
     </task>
+    <task id="LOCAL-00001" summary="commit 1">
+      <created>1702203771661</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1702203771661</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -173,6 +207,13 @@
                       </list>
                     </value>
                   </entry>
+                  <entry key="user">
+                    <value>
+                      <list>
+                        <option value="*" />
+                      </list>
+                    </value>
+                  </entry>
                 </map>
               </option>
             </State>
@@ -180,8 +221,24 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="User">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="*" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/PyCharmProjects$senkin_alexander_lab_1.coverage" NAME="senkin_alexander_lab_1 Coverage Results" MODIFIED="1697744262965" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/senkin_alexander_lab_1" />
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="commit 1" />
+    <option name="LAST_COMMIT_MESSAGE" value="commit 1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/istyukov_timofey_lab1/lab1.py b/istyukov_timofey_lab1/lab1.py
index d9c7f23..9c00a83 100644
--- a/istyukov_timofey_lab1/lab1.py
+++ b/istyukov_timofey_lab1/lab1.py
@@ -9,12 +9,11 @@
 import numpy as np
 from sklearn.datasets import make_classification
 from sklearn.linear_model import LinearRegression, Perceptron, Ridge
-from matplotlib import pyplot as plt
-from matplotlib.colors import ListedColormap
 from sklearn.model_selection import train_test_split
-from sklearn.metrics import mean_absolute_error, mean_squared_error, accuracy_score, balanced_accuracy_score
 from sklearn.pipeline import make_pipeline
 from sklearn.preprocessing import PolynomialFeatures
+from matplotlib import pyplot as plt
+from matplotlib.colors import ListedColormap
 
 
 
@@ -48,10 +47,7 @@ def my_linear_regression(X_train, X_test, y_train, y_test):
     # вывод в консоль
     print()
     print('===> Линейная регрессия <===')
-    print('Оценка точности:')
-    print('MAE:', mean_absolute_error(y_test, y_pred))
-    print('MSE:', mean_squared_error(y_test, y_pred))
-    print()
+    print('Оценка точности: ', lin_reg_model.score(X_train, y_train))
 
     # вывод в график
     plt.title('Линейная регрессия')
@@ -71,10 +67,7 @@ def my_perceptron(X_train, X_test, y_train, y_test):
     # вывод в консоль
     print()
     print('===> Персептрон <===')
-    print('Оценка точности:')
-    print('По тренировочным данным: ', perceptron_model.score(X_train, y_train))
-    print('По тестовым данным: ', accuracy_score(y_test, y_pred))
-    print()
+    print('Оценка точности: ', perceptron_model.score(X_train, y_train))
 
     # вывод в график
     plt.title('Персептрон')
@@ -94,10 +87,7 @@ def my_poly_ridge(X_train, X_test, y_train, y_test):
     # вывод в консоль
     print()
     print('===> Гребневая полиномиальная регрессия <===')
-    print('Оценка точности:')
-    print('MAE:', mean_absolute_error(y_test, y_pred))
-    print('MSE:', mean_squared_error(y_test, y_pred))
-    print()
+    print('Оценка точности: ', poly_rige_model.score(X_train, y_train))
 
     # вывод в график
     plt.title('Гребневая полиномиальная регрессия')