From e31a4201a85b760dc085a22c5203a9dfebb2459c Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Sat, 5 Oct 2024 10:51:07 +0300 Subject: [PATCH 1/7] changed FIO --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 714ee322..3dbb4630 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Вот сюда нужно будет в первой работе с гитом добавит свое ФИО -## ФИО +## Федоров Максим Денисович ## Работа с репозиторием From 88b9907f0d21a71bc7bccf63482ff681d6f1217d Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Sun, 15 Dec 2024 18:00:31 +0300 Subject: [PATCH 2/7] done lab 3 --- golang/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golang/main.go b/golang/main.go index d2c4e91e..593b09a6 100644 --- a/golang/main.go +++ b/golang/main.go @@ -3,5 +3,5 @@ package main import "fmt" func main() { - fmt.Println("Hello world") + fmt.Println("Fedorov Max Denisovich ") } From 67bd4ae04e397eba8bcdc0b51bbbfba88599ae8b Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Sun, 15 Dec 2024 19:29:42 +0300 Subject: [PATCH 3/7] done 4 lab --- golang/lab4/lab4.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 golang/lab4/lab4.go diff --git a/golang/lab4/lab4.go b/golang/lab4/lab4.go new file mode 100644 index 00000000..59099835 --- /dev/null +++ b/golang/lab4/lab4.go @@ -0,0 +1,35 @@ +package lab4 + +import ( + "fmt" + "math" +) + +func RunLab4() { + a := 2.5 + b := 4.6 + fmt.Println(TaskA(1.15, 3.05, 0.38, a, b)) + arr := []float64{1.2, 1.28, 1.36, 1.46, 2.35} + fmt.Println(TaskB(arr, a, b)) +} + +func TaskA(xn, xk, deltax, a, b float64) []float64 { + var yValues []float64 + for x := xn; x <= xk; x += deltax { + yValues = append(yValues, CalculateY(x, a, b)) + } + return yValues +} + +func TaskB(values []float64, a, b float64) []float64 { + var yValues []float64 + for _, x := range values { + yValues = append(yValues, CalculateY(x, a, b)) + } + return yValues +} + +func CalculateY(x float64, a float64, b float64) float64 { + y := math.Sin(math.Pow(a+b*x, 3.5)) / (1 + math.Cos(math.Log10(a+b*x))) + return y +} From 1aab4ec66847ee0c9e20cb946dca5e7689c16ad9 Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Fri, 20 Dec 2024 17:02:25 +0300 Subject: [PATCH 4/7] lab6 --- golang/lab6/lab6.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 golang/lab6/lab6.go diff --git a/golang/lab6/lab6.go b/golang/lab6/lab6.go new file mode 100644 index 00000000..694b9273 --- /dev/null +++ b/golang/lab6/lab6.go @@ -0,0 +1,35 @@ +package lab6 + +import "fmt" + +type Telephone struct { + Model string + Weight float64 + display_size float64 +} + +func NewTelephone(Model string, Weight, display_size float64) Telephone { + return Telephone{ + Model: Model, + Weight: Weight, + display_size: display_size, + } + +} + +func (f Telephone) Info() string { + return fmt.Sprintf("Модель: %s, Вес модели: %s, Размер дисплея модели: %d минут", f.Model, f.Weight, f.display_size) +} +func (f *Telephone) UpdateModel(newModel string) { + f.Model = newModel +} +func (f Telephone) Buy() { + fmt.Printf("Вы купили телефон модели:%s веса:%s у которого размер дисплея:%s", f.Model, f.Weight, f.display_size) +} +func ExecuteLab6() { + Telephone := NewTelephone("Iphone 15 Pro Max", 0.221, 6.7) + Telephone.Buy() + fmt.Println(Telephone.Info()) + Telephone.UpdateModel("Iphone 16") + fmt.Println(Telephone.Info()) +} From a0d854717043ddd11375b8cdf39292141b9fe3b1 Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Fri, 20 Dec 2024 17:13:58 +0300 Subject: [PATCH 5/7] lab6 --- golang/lab6/lab6.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/golang/lab6/lab6.go b/golang/lab6/lab6.go index 694b9273..a120eab4 100644 --- a/golang/lab6/lab6.go +++ b/golang/lab6/lab6.go @@ -14,17 +14,16 @@ func NewTelephone(Model string, Weight, display_size float64) Telephone { Weight: Weight, display_size: display_size, } - } func (f Telephone) Info() string { - return fmt.Sprintf("Модель: %s, Вес модели: %s, Размер дисплея модели: %d минут", f.Model, f.Weight, f.display_size) + return fmt.Sprintf("Модель: %s, Вес модели: %d, Размер дисплея модели: %d минут", f.Model, f.Weight, f.display_size) } func (f *Telephone) UpdateModel(newModel string) { f.Model = newModel } func (f Telephone) Buy() { - fmt.Printf("Вы купили телефон модели:%s веса:%s у которого размер дисплея:%s", f.Model, f.Weight, f.display_size) + fmt.Printf("Вы купили телефон модели:%s веса:%d у которого размер дисплея:%s", f.Model, f.Weight, f.display_size) } func ExecuteLab6() { Telephone := NewTelephone("Iphone 15 Pro Max", 0.221, 6.7) From fb7e704eeada771010f7454cdd4d3134db62f9ff Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Fri, 20 Dec 2024 17:31:43 +0300 Subject: [PATCH 6/7] lab 6 --- golang/lab6/lab6.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/golang/lab6/lab6.go b/golang/lab6/lab6.go index a120eab4..da925c80 100644 --- a/golang/lab6/lab6.go +++ b/golang/lab6/lab6.go @@ -17,13 +17,13 @@ func NewTelephone(Model string, Weight, display_size float64) Telephone { } func (f Telephone) Info() string { - return fmt.Sprintf("Модель: %s, Вес модели: %d, Размер дисплея модели: %d минут", f.Model, f.Weight, f.display_size) + return fmt.Sprintf("Модель: %s Вес модели: %f, Размер дисплея модели: %f минут", f.Model, f.Weight, f.display_size) } func (f *Telephone) UpdateModel(newModel string) { f.Model = newModel } func (f Telephone) Buy() { - fmt.Printf("Вы купили телефон модели:%s веса:%d у которого размер дисплея:%s", f.Model, f.Weight, f.display_size) + fmt.Printf("Вы купили телефон модели:%s веса:%f у которого размер дисплея:%f", f.Model, f.Weight, f.display_size) } func ExecuteLab6() { Telephone := NewTelephone("Iphone 15 Pro Max", 0.221, 6.7) From dde4e2cc72b2989294d184dfe79bcc3a7357e2f7 Mon Sep 17 00:00:00 2001 From: HeX04yXa123 Date: Thu, 26 Dec 2024 20:44:42 +0300 Subject: [PATCH 7/7] lab6 --- .vscode/launch.json | 7 +++++++ golang/go.mod | 2 -- golang/go.sum | 17 ----------------- golang/main.go | 9 ++++++++- 4 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..5c7247b4 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,7 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [] +} \ No newline at end of file diff --git a/golang/go.mod b/golang/go.mod index d1cc943c..5cecc1f3 100644 --- a/golang/go.mod +++ b/golang/go.mod @@ -1,5 +1,3 @@ module isuct.ru/informatics2022 go 1.16 - -require github.com/stretchr/testify v1.8.1 diff --git a/golang/go.sum b/golang/go.sum index 2ec90f70..e69de29b 100644 --- a/golang/go.sum +++ b/golang/go.sum @@ -1,17 +0,0 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/golang/main.go b/golang/main.go index 593b09a6..e5f8aa26 100644 --- a/golang/main.go +++ b/golang/main.go @@ -1,7 +1,14 @@ package main -import "fmt" +import ( + "fmt" + + "isuct.ru/informatics2022/lab4" + "isuct.ru/informatics2022/lab6" +) func main() { fmt.Println("Fedorov Max Denisovich ") + lab6.ExecuteLab6() + lab4.RunLab4() }