Реализовал с удалением по столбцам, не сработало

This commit is contained in:
AZEN-SGG 2025-04-08 20:22:08 +03:00
parent b087cb236a
commit 191b0205e6
2 changed files with 12 additions and 11 deletions

View file

@ -10,17 +10,17 @@ WFLAGS = -fstack-protector-all -W -Wall -Wextra -Wunused \
CFLAGS = -mfpmath=sse -std=gnu99 -O3 CFLAGS = -mfpmath=sse -std=gnu99 -O3
TARGET = a.exe TARGET = a.out
OBJ = main.o solve.o array_io.o init_f.o matrix.o OBJ = main.o solve.o array_io.o init_f.o matrix.o
%.o: %.c %.o: %.c
gcc $(CFLAGS) $(WFLAGS) -c $< -o $@ gcc $(CFLAGS) $(WFLAGS) -c $< -o $@
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
gcc $^ -o $@ -lm -lssp gcc $^ -o $@ -lm
gdb: CFLAGS = -mfpmath=sse -std=gnu99 -g gdb: CFLAGS = -mfpmath=sse -std=gnu99 -g
gdb: clean $(TARGET) gdb: clean $(TARGET)
clean: clean:
del -f *.o *.exe rm -f *.o *.out

View file

@ -45,11 +45,11 @@ int t14_solve(int n, double * restrict A, double * restrict X, int * restrict c)
int kn = k*n; int kn = k*n;
int in = max_i*n; int in = max_i*n;
for (int im = max_i, ik = k; im < n*n; im+=n, ik+=n) for (int mj = in, kj = kn; mj < in+n; ++mj, ++kj)
{ {
double swap = X[ik]; double swap = X[mj];
X[ik] = X[im]; X[mj] = X[kj];
X[im] = swap; X[kj] = swap;
} }
for (int i = k; i < n; ++i) for (int i = k; i < n; ++i)
@ -91,7 +91,6 @@ int t14_solve(int n, double * restrict A, double * restrict X, int * restrict c)
// print_matrix(X, n, n); // print_matrix(X, n, n);
} }
transpose(n, X);
gauss_back_substitution(n, A, X); gauss_back_substitution(n, A, X);
// Возвращаем строки назад // Возвращаем строки назад
@ -150,15 +149,17 @@ void gauss_inverse(const int n, const int k, double * restrict A, double * restr
// Меняем обратную матрицу // Меняем обратную матрицу
for (int j = 0; j < n; ++j) for (int j = 0; j < n; ++j)
{ {
const int BS = 32;
double xkj = X[kn + j]; double xkj = X[kn + j];
if (fabs(xkj) <= eps) if (fabs(xkj) <= eps)
continue; continue;
xkj *= inv_akk; xkj *= inv_akk;
X[kn + j] = xkj; X[kn + j] = xkj;
for (int i = k+1; i < n; i++) for (int i_block = k + 1; i_block < n; i_block += BS)
X[i*n + j] -= xkj * A[i*n + k]; for (int i = i_block; i < i_block + BS && i < n; ++i)
X[i * n + j] -= xkj * A[i * n + k];
} }
for (int i = k+1; i < n; ++i) for (int i = k+1; i < n; ++i)