Skip to content

Commit 2d38329

Browse files
committed
как-то так
1 parent 36e5497 commit 2d38329

File tree

6 files changed

+4
-4
lines changed

6 files changed

+4
-4
lines changed

lab7_2/lab.jar

4 Bytes
Binary file not shown.

lab7_2/src/main/scala/Main.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Main {
55
def main(args: Array[String]) {
66
val (d1,d2,d3) = (args(0).toDouble,args(1).toDouble,args(2).toDouble)
77
def phi(x:Array[Double]) = pow(x(0) - d1,2)/4+pow(x(1)-d2,2)/9 + d3
8-
val (alpfa,beta,eps) = (2,-0.5,0.5)
8+
val (alpfa,beta,eps) = (2,-0.5,0.2)
99
var iter = 0
1010
val lambda = Array[Double](2,2)
1111
var x0 = Array[Double](0,0)

lab7_3/lab.jar

-7 Bytes
Binary file not shown.

lab7_3/run11.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2-
java -jar $DIR/lab.jar 1 1 3 3 -0.5 0.5
2+
java -jar $DIR/lab.jar 1 1 3 0.000001

lab7_3/run6.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2-
java -jar $DIR/lab.jar 2 1 1 3 -0.5 0.5
2+
java -jar $DIR/lab.jar 2 1 1 0.1

lab7_3/src/main/scala/Main.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scala.math._
33
object Main extends App {
44
val (d1, d2, d3) = (args(0).toDouble, args(1).toDouble, args(2).toDouble)
55
def phi(x: Array[Double]) = pow(x(0) - d1, 2) / 4 + pow(x(1) - d2, 2) / 9 + d3
6-
val (alpfa, beta, eps) = (2, -0.5, 0.5)
6+
val (alpfa, beta, eps) = (2, -0.5, args(3).toDouble)
77
def argmin(x: Array[Double], l: Double, n: Int) = {
88
var lambda = l
99
val xs = x(n)

0 commit comments

Comments
 (0)