From 1585c76980cb6779027a4a307de4e6323d9b0b22 Mon Sep 17 00:00:00 2001
From: ParkSuMin <kamalovap@paksurion.ru>
Date: Thu, 2 Oct 2025 15:46:22 +0300
Subject: [PATCH] I hate GU3

---
 MemMAPR-MKE.cpp | 10 ++++++++--
 Solver.cpp      | 33 ++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/MemMAPR-MKE.cpp b/MemMAPR-MKE.cpp
index 7c5fb21..baa3a72 100644
--- a/MemMAPR-MKE.cpp
+++ b/MemMAPR-MKE.cpp
@@ -1,12 +1,18 @@
 #include "Header.h"
 #include "Solver.h"
 #include <Eigen/Dense>
+#define A 5.
+#define B 4.
+#define C 0.
+#define D 1.
+
 using namespace Eigen;
 int main() {
-    Solver slv(5., 4., 0., 1., 30, 0, 10);
+    std::cout << A << "u''" << " + " << B << "u'" << "+ " << C << "u + " << D << " = 0" << std::endl;
+    Solver slv(5., 4., 0., 1., 2, 0, 10);
     std::cout << "Linear element:";
     slv.Execute_Linear(0, 5);
     std::cout << "\nCubic element:";
-    slv.Execute_Cubic(0, 5);
+    //slv.Execute_Cubic(0, 5);
     return 0;
 }
\ No newline at end of file
diff --git a/Solver.cpp b/Solver.cpp
index 6234ff3..1065ec0 100644
--- a/Solver.cpp
+++ b/Solver.cpp
@@ -16,24 +16,24 @@ void Solver::Execute_Linear(double val1, double val2) {
     // Локальный вектор нагрузки
     VectorXd local_load(2);
 
-    local(0, 0) = -A / L - B / 2. + C * L / 3.;
-    local(0, 1) = A / L + B / 2. + C * L / 6.;
-    local(1, 0) = A / L - B / 2. + C * L / 6.;
-    local(1, 1) = -A / L + B / 2. + C * L / 3.;
+    local(0, 0) = -A / L - B / 2. + C * L / 2.;
+    local(0, 1) = A / L + B / 2. + C * L / 2.;
+    local(1, 0) = A / L - B / 2. + C * L / 2.;
+    local(1, 1) = -A / L + B / 2. + C * L / 2.;
 
     local_load(0) = -D * L / 2.;
     local_load(1) = -D * L / 2.;
 
     // Глобальная матрица жёсткости
-    MatrixXd ansamb = MatrixXd::Zero(N + 1, N + 1);
+    MatrixXd ansamb = MatrixXd::Zero(N + 2, N + 2);
     
     // Глобальный вектор нагрузок
-    VectorXd global_load = VectorXd::Zero(N + 1);
+    VectorXd global_load = VectorXd::Zero(N + 2);
 
-    // Ансамблирование
+    // Ансамблирование (с учётом смещения на 1)
     for (int elem = 0; elem < N; ++elem) {
-        int node_i = elem;
-        int node_j = elem + 1;
+        int node_i = elem + 1;
+        int node_j = elem + 2;
 
         ansamb(node_i, node_i) += local(0, 0);
         ansamb(node_i, node_j) += local(0, 1);
@@ -52,15 +52,18 @@ void Solver::Execute_Linear(double val1, double val2) {
 
     // Граничные условия
     double u_right = val2;
+
+
     ansamb.row(0).setZero();
-    ansamb.row(N).setZero();
-
-    ansamb(0, 0) = L + 1;
-    ansamb(0, 1) = -1;
+    ansamb(0, 0) = 1;
+    ansamb(0, 1) = -A;
     global_load(0) = 0;
+    ansamb(1, 1) += -A;
 
-    ansamb(N, N) = 1;
-    global_load(N) = u_right;
+    ansamb.row(N + 1).setZero();
+    ansamb.col(N + 1).setZero();
+    ansamb(N + 1, N + 1) = 1;
+    global_load(N + 1) = u_right;
 
 #if DEBUG
     std::cout << "\nAfter:" << std::endl;