AZEN-SGG/2nd_Sem_Bogachev
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Исправил

Browse source
This commit is contained in:
AZEN-SGG 2025-04-08 13:37:34 +03:00
parent 44ed843999
commit 48ab5717a0
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
2025.04.04/dist/Krivoruchenko_SK/Makefile vendored
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.out TARGET = a.exe
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 gcc $^ -o $@ -lm -lssp
gdb: CFLAGS = -mfpmath=sse -std=gnu99 -g gdb: CFLAGS = -mfpmath=sse -std=gnu99 -g
gdb: clean $(TARGET) gdb: clean $(TARGET)
clean: clean:
rm -f *.o *.out del *.o *.exe

31
2025.04.04/dist/Krivoruchenko_SK/solve.c vendored
View file

@ -31,6 +31,9 @@ int t14_solve(int n, double * restrict A, double * restrict X, int * restrict c)
max_j = j; max_j = j;
} }
} }
printf("\n------- K = %d -------\n", k);
printf("Maximum = %lf i = %d j = %d\n", maximum, max_i, max_j);
// Если максимальный по модулю элемент равен нулю, значит матрица вырождена // Если максимальный по модулю элемент равен нулю, значит матрица вырождена
if (fabs(maximum) < eps) if (fabs(maximum) < eps)
@ -77,10 +80,16 @@ int t14_solve(int n, double * restrict A, double * restrict X, int * restrict c)
A[in + max_j] = swap; A[in + max_j] = swap;
} }
} }
printf("BEFORE GAUSS\n");
printf("Original matrix:\n");
print_matrix(A, n, n);
printf("Inverse matrix:\n");
print_matrix(X, n, n);
gauss_inverse(n, k, A, X); gauss_inverse(n, k, A, X);
printf("\n------- K = %d -------\n", k); printf("AFTER GAUSS\n");
printf("Original matrix:\n"); printf("Original matrix:\n");
print_matrix(A, n, n); print_matrix(A, n, n);
printf("Inverse matrix:\n"); printf("Inverse matrix:\n");
@ -127,7 +136,7 @@ int t14_solve(int n, double * restrict A, double * restrict X, int * restrict c)
return 0; return 0;
} }
// Прямой ход Го ----- йда
void gauss_inverse(const int n, const int k, double * restrict A, double * restrict X) void gauss_inverse(const int n, const int k, double * restrict A, double * restrict X)
{ {
const int kn = k*n; const int kn = k*n;
@ -135,28 +144,22 @@ void gauss_inverse(const int n, const int k, double * restrict A, double * restr
const double inv_akk = 1./A[kk]; const double inv_akk = 1./A[kk];
A[kk] = 1.; A[kk] = 1.;
for (int ij = kk+1; ij < kn+n; ++ij) for (int ij = kk+1; ij < kn+n; ij++)
{ A[ij] *= inv_akk;
double aij = A[ij];
if (fabs(aij) > DBL_EPSILON) A[ij] = aij*inv_akk;
}
for (int ij = kn; ij < kk; ++ij) for (int ij = kn; ij <= kk; ij++)
X[ij] *= inv_akk; X[ij] *= inv_akk;
X[kk] = inv_akk;
for (int i = k+1; i < n; ++i) for (int i = k+1; i < n; ++i)
{ {
const int in = i*n; const int in = i*n;
const double aik = A[in + k]; const double aik = A[in + k];
A[in + k] = 0; A[in + k] = 0;
X[in + k] = -inv_akk * aik;
for (int ij = in, kj = kn; kj < kk; ++ij, ++kj) for (int ij = in, kj = kn; kj < kn + n; ij++, kj++)
X[ij] -= X[kj] * aik; X[ij] -= X[kj] * aik;
for (int ij = in+k+1, kj = kk+1; ij < in+n; ++ij, ++kj) for (int ij = in+k+1, kj = kk+1; ij < in+n; ij++, kj++)
A[ij] -= A[kj] * aik; A[ij] -= A[kj] * aik;
} }
} }