Hw 4 by AnNyiiik · Pull Request #4 · AnNyiiik/FSharpCourse

AnNyiiik · 2024-04-05T20:04:02Z

No description provided.

DedSec256 · 2024-05-28T20:35:03Z

PointFree/PointFree/PointFree.fs

+        let f (x : int) = (*) x
+        let f_withoutX = f
+        let func  =  f_withoutX >> List.map
+        func


ожидалась point-free запись без использования промежуточных let.

DedSec256 · 2024-05-30T18:49:42Z

PhoneBook/PhoneBook/PhoneBook.fs

+    type Person =
+        val Name : string
+        val Number : string
+
+        new (name, phone) = { Name = name; Number = phone;}


Suggested change

type Person =

val Name : string

val Number : string

new (name, phone) = { Name = name; Number = phone;}

type Person = { Name: string; Number: string }

DedSec256 · 2024-05-30T20:05:50Z

Brackets/Brackets/BracketsChecker.fs

+module Brackets =
+
+    let checkSequence (sequence : string) =
+        let rec checkRec sequence stack position =


пусть стек будет типа char list, это повзолит избежать конкатенаций строк и позволит использовать паттерн-матчинг

DedSec256 · 2024-05-30T20:06:28Z

Brackets/Brackets/BracketsChecker.fs

+                    if (String.length stack = 0) then false
+                    else
+                        if ((bracket = ')' && stack.[0] = '(') || (bracket = ']' && stack.[0] = '[') || (bracket = '}' && stack.[0] = '{')) then


нужно использовать паттерн матчинг на stack

DedSec256 · 2024-05-30T20:07:26Z

Brackets/Brackets/BracketsChecker.fs

+            else
+                let bracket = sequence.[position]
+                match bracket with
+                | '[' | '{' | '(' ->


можно завести отдельные небольшие функции, которые проверят, что скобочка открывающаяся, закрывающаяся и какие скобки образуют пару.

Или, как вариант, Map

DedSec256 · 2024-05-30T20:08:52Z

Brackets/BracketsChecker.Tests/UnitTest.fs

+    }
+
+let testCasesFalse =
+    seq {


нужны тесты на "", ")", "("

DedSec256 · 2024-05-31T19:58:08Z

PhoneBook/PhoneBook/Program.fs

+let mutable errors = 0
+let mutable data = []


нельзя использовать мутабельное состояние

DedSec256 · 2024-05-31T19:59:52Z

PhoneBook/PhoneBook/Program.fs

+let rec ``find name or phone`` code =
+    if (errors > 5) then ()
+    if code = 2 then printfn "enter the name:\n" else printfn "enter the phone:\n"
+    let item = Console.ReadLine()
+    if (code = 2 && not (name_regex().IsMatch(item)) || code = 3 && not (phone_regex().IsMatch(item))) then
+        printfn "incorrect data, try again\n"
+        errors <- errors + 1
+        ``find name or phone`` code
+    else
+        errors <- 0
+        if code = 2 then
+            match findByName item data with
+            | None -> printfn "%s" "there is no such name\n"
+            | Some name -> printfn "%s" (name.ToString())
+        else match findByPhone item data with
+                | None -> printfn "%s" "there is no such number\n"
+                | Some number -> printfn "%s" (number.ToString())


разделите функцию на две

DedSec256 · 2024-05-31T20:01:41Z

PhoneBook/PhoneBook/Program.fs

+To read data from file and save it to phone book press 6:\n"
+
+
+let mutable errors = 0


точно ли нам эта логика с ошибками нужна?

DedSec256 · 2024-05-31T20:03:13Z

PhoneBook/PhoneBook/PhoneBook.fs

+        if List.exists(fun (p : Person) -> p.Number = person.Number) data
+        then data else person :: data


я бы делал, в случае добавления дубликата, более очевидный тип ошибки, нежели скрывать её за возвращением того же набора данных

DedSec256 · 2024-05-31T20:03:42Z

PhoneBook/PhoneBook.Tests/UnitTests.fs

+let comparePersons (p1 : Person)  (p2 : Person) =
+    if p1.Name < p2.Name then -1 else
+    if p1.Name = p2.Name then
+        if p1.Number < p2.Number then -1
+        else 1
+    else 1


это не нужно, рекорды сравниваются структурно через обычное =

DedSec256 · 2024-05-31T20:25:41Z

PointFree/PointFree.Tests/UnitTests.fs

+let funcInitial x l = List.map (fun y -> y * x) l
+let funcWithoutL1 x = List.map (fun y -> y * x)
+let funcWithoutL2 x = List.map (fun y -> (*) y x)
+let funcWithoutL3 x = List.map << (fun y -> (*) y) <| x


Suggested change

let funcWithoutL3 x = List.map << (fun y -> (*) y) <| x

let funcWithoutL3 x = (List.map << (fun y -> (*) y)) x

DedSec256 · 2024-05-31T20:27:22Z

Brackets/Brackets/BracketsChecker.fs

+                match bracket with
+                | '[' | '{' | '(' ->


воспользуйтесь bracketPairs.Keys.Contains, чтобы не дублировать логику

DedSec256 · 2024-05-31T20:28:18Z

Brackets/Brackets/BracketsChecker.fs

+
+    let checkSequence (sequence : string) =
+        let rec checkRec sequence stack position counter =
+            if (position = String.length sequence) then


Suggested change

if (position = String.length sequence) then

if (position = sequence.Length) then

DedSec256 · 2024-05-31T20:28:43Z

Brackets/Brackets/BracketsChecker.fs

+                        if (bracket = bracketPairs.[stack.[0]])  then
+                            checkRec sequence stack.[1..(counter - 1)] (position + 1) (counter - 1)


давайте использовать паттерн матчинг, чтобы проверять голову и хвост у stack

yurii-litvinov · 2024-06-01T11:18:21Z

PhoneBook/PhoneBook.Tests/UnitTests.fs

+let dataConvertToString = " Tom 89019892909 \n Alice 83890198101 \n John 82839281789 \n Bob +72898271890 \n Hanna +71289019813 \n Sara 81278918789 \n"
+[<Test>]


Suggested change

let dataConvertToString = " Tom 89019892909 \n Alice 83890198101 \n John 82839281789 \n Bob +72898271890 \n Hanna +71289019813 \n Sara 81278918789 \n"

[<Test>]

let dataConvertToString = " Tom 89019892909 \n Alice 83890198101 \n John 82839281789 \n Bob +72898271890 \n Hanna +71289019813 \n Sara 81278918789 \n"

[<Test>]

И вообще, это data |> List.fold ...? Правда ли, что если мы в data что-то поменяем, а тут нет, беда будет? :)

yurii-litvinov · 2024-06-01T11:19:22Z

PhoneBook/PhoneBook.Tests/UnitTests.fs

+    (findByName "Sara" data).Value |> should equal "81278918789"
+    findByName "Kat" data |> should equal None
+
+let dataWrite = "Tom 89019892909\nAlice 83890198101\nJohn 82839281789\nBob +72898271890\nHanna +71289019813\nSara 81278918789"


Кстати, если оно для одного теста, чтоит внутри теста и объявлять

yurii-litvinov · 2024-06-01T11:19:38Z

PhoneBook/PhoneBook/PhoneBook.fs

+open System
+open System.Text.RegularExpressions
+
+module PhoneBook =


Я бы ещё сказал, что надо комментарии

yurii-litvinov · 2024-06-01T11:19:44Z

PhoneBook/PhoneBook/PhoneBook.fs

+namespace PhoneBook
+open System


Suggested change

namespace PhoneBook

open System

namespace PhoneBook

open System

yurii-litvinov · 2024-06-01T11:20:02Z

PhoneBook/PhoneBook/PhoneBook.fs

+
+    type Person = { Name: string; Number: string }
+
+    let phone_regex () = Regex(@"(\+7|7|8)+\d{10}", RegexOptions.Compiled)


В .NET используют camelCase, это ж не Питон

yurii-litvinov · 2024-06-01T11:21:13Z

PhoneBook/PhoneBook/PhoneBook.fs

+    let addRecord (person : Person) data =
+        if List.exists(fun (p : Person) -> p.Number = person.Number) data
+        then
+            invalidArg "" "incorrect data: the number already exists"


имя параметра пустое, нехорошо

в ФП не любят исключения, они неявны и вызывающий может быть неготов к тому, что они бросаются. Сделайте более по-ФПшному

Не поправлено

yurii-litvinov · 2024-06-01T11:22:36Z

PhoneBook/PhoneBook/Program.fs

+
+    Some code
+
+let rec ``add record`` data =


Зачем такие странные имена

yurii-litvinov · 2024-06-01T15:22:45Z

PhoneBook/PhoneBook/PhoneBook.fs

+    let phoneRegex () = Regex(@"(\+7|7|8)+\d{10}", RegexOptions.Compiled)
+    let nameRegex () = Regex(@"[A-Z][a-z]+", RegexOptions.Compiled)
+
+    ///Add new record to the data


Suggested change

///Add new record to the data

/// Add new record to the data

yurii-litvinov · 2024-06-01T15:23:01Z

PhoneBook/PhoneBook/PhoneBook.fs

+    let addRecord (person : Person) data =
+        if List.exists(fun (p : Person) -> p.Number = person.Number) data
+        then
+            invalidArg "" "incorrect data: the number already exists"


Не поправлено

AnNyiiik added 8 commits April 5, 2024 22:53

added phone book

ee8bee5

added point free and brackets

940ef26

added tests to phone book

a8c21d8

added new tests

f9220bc

added tests to brackets

cb0b578

changed

f384b7a

added test cases

dfdf154

added tests to point free

9aca942

DedSec256 reviewed May 28, 2024

View reviewed changes

DedSec256 reviewed May 30, 2024

View reviewed changes

Brackets/BracketsChecker.Tests/UnitTest.fs

}

let testCasesFalse =

seq {

Copy link

DedSec256 May 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нужны тесты на "", ")", "("

AnNyiiik added 3 commits May 31, 2024 10:45

changed book

66078e7

changed brackets checker

1b58735

changed point free

baae483

DedSec256 reviewed May 31, 2024

View reviewed changes

AnNyiiik added 2 commits June 1, 2024 01:30

changed book

227519f

add brackets

6ce9bab

yurii-litvinov suggested changes Jun 1, 2024

View reviewed changes

changed phone book

3e29bc1

changed

289347e

yurii-litvinov reviewed Jun 1, 2024

View reviewed changes

deleted exception

8d5090a

yurii-litvinov approved these changes Jun 1, 2024

View reviewed changes

		To read data from file and save it to phone book press 6:\n"


		let mutable errors = 0

		if List.exists(fun (p : Person) -> p.Number = person.Number) data
		then data else person :: data

	let funcWithoutL3 x = List.map << (fun y -> (*) y) <\| x
	let funcWithoutL3 x = (List.map << (fun y -> (*) y)) x

	if (position = String.length sequence) then
	if (position = sequence.Length) then

		if (bracket = bracketPairs.[stack.[0]]) then
		checkRec sequence stack.[1..(counter - 1)] (position + 1) (counter - 1)

		let dataConvertToString = " Tom 89019892909 \n Alice 83890198101 \n John 82839281789 \n Bob +72898271890 \n Hanna +71289019813 \n Sara 81278918789 \n"
		[<Test>]


		type Person = { Name: string; Number: string }

		let phone_regex () = Regex(@"(\+7\|7\|8)+\d{10}", RegexOptions.Compiled)

Conversation

AnNyiiik commented Apr 5, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DedSec256 May 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DedSec256 May 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DedSec256 May 30, 2024 •

edited

Loading

DedSec256 May 31, 2024 •

edited

Loading