Hw3

FsharpSln.sln

@@ -9,6 +9,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibHw2", "src\LibHw2\LibHw2
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test", "Test\Test.fsproj", "{363D4F3B-6E01-4E01-9616-7C95DFB0F5B6}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibHw3", "src\LibHw3\LibHw3.fsproj", "{E63C1F63-167B-47D5-A94C-6C00CDAC9104}"
+EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibHw1", "src\LibHw1\LibHw1.fsproj", "{EEDB2603-0992-464E-B575-A9A5E31DFA3B}"
 EndProject
 Global
@@ -28,10 +30,10 @@ Global
 		{363D4F3B-6E01-4E01-9616-7C95DFB0F5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{363D4F3B-6E01-4E01-9616-7C95DFB0F5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{363D4F3B-6E01-4E01-9616-7C95DFB0F5B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEDB2603-0992-464E-B575-A9A5E31DFA3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEDB2603-0992-464E-B575-A9A5E31DFA3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEDB2603-0992-464E-B575-A9A5E31DFA3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEDB2603-0992-464E-B575-A9A5E31DFA3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E63C1F63-167B-47D5-A94C-6C00CDAC9104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E63C1F63-167B-47D5-A94C-6C00CDAC9104}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E63C1F63-167B-47D5-A94C-6C00CDAC9104}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E63C1F63-167B-47D5-A94C-6C00CDAC9104}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{07D1365E-068B-4B9D-999D-4F9C3B544697} = {C3F2792A-709B-4169-ADE4-3D55DC717452}

Test/Test.fsproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="TestsHw3.fs" />
     <Compile Include="TestHw1.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
@@ -21,14 +22,15 @@
     <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\src\LibHw2\LibHw2.fsproj" />
+    <ProjectReference Include="..\src\LibHw3\LibHw3.fsproj" />
     <ProjectReference Include="..\src\LibHw1\LibHw1.fsproj" />
   </ItemGroup>
 

Test/TestsHw3.fs

@@ -0,0 +1,113 @@
+namespace tests
+
+open Xunit
+open FsCheck
+open FsCheck.Xunit
+open ListLib
+
+module UnitTests =
+
+    [<Fact>]
+    let MergeTest () =
+        let expected = List.sort []
+        let lst = MyList.fromList []
+        let lst2 = MyList.mergeSort lst compare
+        let actual = MyList.toList lst2
+        Assert.Equal<int>(expected, actual)
+
+    [<Fact>]
+    let BubbleTest () =
+        let expected = List.sort []
+        let lst = MyList.fromList []
+        let lst2 = MyList.bubbleSort lst compare
+        let actual = MyList.toList lst2
+        Assert.Equal<int>(expected, actual)
+
+    [<Fact>]
+    let QuickTest () =
+        let expected = List.sort []
+        let lst = MyList.fromList []
+        let lst2 = MyList.quickSort lst compare
+        let actual = MyList.toList lst2
+        Assert.Equal<int>(expected, actual)
+
+module PropertyTests =
+
+    [<Properties(MaxTest = 100)>]
+    type MergeTest() =
+
+        [<Property>]
+        member _.intTest(testList: int list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.mergeSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<int>(expected, actual)
+
+        [<Property>]
+        member _.charTest(testList: char list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.mergeSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<char>(expected, actual)
+
+        [<Property>]
+        member _.floatTest(testList: float list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.mergeSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<float>(expected, actual)
+
+    type QuickTest() =
+
+        [<Property>]
+        member _.``intTest``(testList: int list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.quickSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<int>(expected, actual)
+
+        [<Property>]
+        member _.charTest(testList: char list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.quickSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<char>(expected, actual)
+
+        [<Property>]
+        member _.floatTest(testList: float list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.quickSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<float>(expected, actual)
+
+    type BubbleTest() =
+
+        [<Property>]
+        member _.intTest(testList: int list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.bubbleSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<int>(expected, actual)
+
+        [<Property>]
+        member _.charTest(testList: char list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.bubbleSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<char>(expected, actual)
+
+        [<Property>]
+        member _.floatTest(testList: float list) =
+            let expected = List.sort testList
+            let lst = MyList.fromList testList
+            let lst2 = MyList.bubbleSort lst compare
+            let actual = MyList.toList lst2
+            Assert.Equal<float>(expected, actual)

src/LibHw3/LibHw3.fsproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+  </ItemGroup>
+
+</Project>

src/LibHw3/Library.fs

@@ -0,0 +1,83 @@
+namespace ListLib
+
+module MyList =
+
+    type MyList<'elem> =
+        | Empty
+        | Cons of 'elem * MyList<'elem>
+
+    let rec toList myList =
+        match myList with
+        | Empty -> []
+        | Cons (head, tail) -> head :: toList tail
+
+    let rec fromList lst =
+        match lst with
+        | [] -> Empty
+        | hd :: tl -> Cons(hd, fromList tl)
+
+    // Сортировка слиянием
+    let rec merge left right compare =
+        match left, right with
+        | Empty, _ -> right
+        | _, Empty -> left
+        | Cons (x1, tail1), Cons (x2, tail2) ->
+            if compare x1 x2 <= 0 then
+                Cons (x1, merge tail1 right compare)
+            else
+                Cons (x2, merge left tail2 compare)
+
+    let rec split list =
+        match list with
+        | Empty -> (Empty, Empty)
+        | Cons (x, Empty) -> (Cons (x, Empty), Empty)
+        | Cons (x1, Cons (x2, tail)) ->
+            let left, right = split tail
+            (Cons (x1, left), Cons (x2, right))
+
+    let rec mergeSort list compare =
+        match list with
+        | Empty -> Empty
+        | Cons (x, Empty) -> Cons (x, Empty)
+        | _ ->
+            let left, right = split list
+            merge (mergeSort left compare) (mergeSort right compare) compare
+
+    // Сортировка пузырьком
+    let rec bubbleSort list compare =
+        let rec swap list notSorted =
+            match list with
+            | Empty -> (Empty, notSorted)
+            | Cons (x, Empty) -> (Cons (x, Empty), notSorted)
+            | Cons (x1, Cons (x2, tail)) ->
+                if compare x1 x2 > 0 then
+                    let newTail, _ = swap (Cons (x1, tail)) true
+                    (Cons (x2, newTail), true)
+                else
+                    let newTail, wasChanged = swap (Cons (x2, tail)) notSorted
+                    (Cons (x1, newTail), wasChanged)
+
+        let sortedList, wasChanged = swap list false
+        if wasChanged then bubbleSort sortedList compare else sortedList
+
+    // QuickSort
+    let rec append list1 list2 =
+        match list1 with
+        | Empty -> list2
+        | Cons (head, tail) -> Cons (head, append tail list2)
+
+    let rec filter func list = 
+        match list with
+        | Empty -> Empty
+        | Cons (elem, tl) when func elem -> Cons (elem, filter func tl)
+        | Cons (elem, Empty) when not (func elem) -> Empty
+        | Cons (elem1, Cons(elem2, tl)) when not (func elem1) -> filter func (Cons(elem2, tl))
+        | _ -> Empty
+
+    let rec quickSort list compare =
+        match list with
+        | Empty -> Empty
+        | Cons (pivot, tail) ->
+            let less = filter (fun x -> compare x pivot < 0) tail
+            let greater = filter (fun x -> compare x pivot >= 0) tail
+            append (quickSort less compare) (Cons(pivot, quickSort greater compare))