added 218, 226, 234, 240

1 files changed, 4 insertions, 4 deletions

diff --git a/219/main.cpp b/219/main.cpp
index f6fc4e2..d5a4735 100644
--- a/219/main.cpp
+++ b/219/main.cpp
@@ -25,14 +25,14 @@ f64p (ex1) (std::string file) {
 	     L = {0.25, 0.005},
 	     r_2 = {0.006, 5e-6}, r_1 = {0.075e-3, 5e-6},
 	     k = prak::function<f64>([](vecarg a){ return a[0] * a[1] / (2 * prak::PI * a[2] * a[3]) * std::log(a[4]/a[5]);}, {alpha, B, L, A, r_2, r_1});
-	std::cout << "k = " << k << '\n';
+	std::cout var(alpha) var (L) var(r_1) var(r_2) << "k = " << k << '\n';
 	f64p eps = {0.35, 0.005}, sgm = {5.67e-8, 0.01e-8}, 
 	     S = prak::function<f64>([](vecarg a){ return 2 * prak::PI * a[0] * a[1]; }, {r_1, L}),
 	     R = {t.col_avg("R"), 0}, dT = prak::function<f64>([](vecarg a){return std::abs((a[0] - a[1])/(a[1]*a[2]));}, {R, B, alpha}),
 	     T_0 = {295, 5}, T_1 = T_0 + dT, W_rad = eps * sgm * (T_1*T_1*T_1*T_1 - T_0*T_0*T_0*T_0)*S, 
 	     g = {9.8, 0.05}, beta = 1.0 / T_0, nu = {1.6e-5, 0.1e-5}, Gr = g * beta * L * L * L * dT / nu / nu,
 	     alpha2 = 0.75 * k / L * ((0.7 * Gr) ^ 0.25), W_con = alpha2 * dT * S;
-	std::cout var(eps) var(sgm) var(R) var(dT) var(T_0) var(T_1) var(W_rad) var(beta) var(nu) var(Gr) var(alpha2) var(W_con);
+	std::cout var(eps) var(sgm) var(R) var(dT) var(T_0) var(T_1) var(S) var(W_rad) var(beta) var(nu) var(Gr) var(alpha2) var(W_con);
 	return k;
 }
 
@@ -54,8 +54,8 @@ f64p (ex2) (const std::string& s) {
 
 int (main) (void) {
 	std::cout << ex1("data") / ex2("data2") / 2.0  
-		  << " = C_P\nпо табличным значениям: C_P = " << 0.0259 / 0.001004 / 2
-		  << "\nПо здравому смыслу:7/2R = " << 7.0/2 * 8.31  << std::endl;
+		  << " = C_V\nпо табличным значениям: C_V = " << 0.0259 / 0.001004 / 2
+		  << "\nПо здравому смыслу:5/2R = " << 5.0/2 * 8.31  << std::endl;
 
 	return 0;
 }