Simplify model

Author: AlgorithmsAreCool

src/Paths.fs

@@ -9,9 +9,6 @@ type Location =
 | Rel of RelPath
 | Abs of AbsPath
 
-type FileLocation = FileLocation of Location
-type DirLocation = DirLocation of Location
-
 let toAbs (AbsPath anchorPath) (RelPath relativeSegment) =
     let anchorDir = Path.GetDirectoryName(anchorPath)
     Path.Combine(anchorDir, relativeSegment) |> Path.GetFullPath |> AbsPath
@@ -25,8 +22,4 @@ let normalize anchor location =
 let toLocation(str : string) =
     match Path.IsPathRooted(str) with
     | true -> str |> AbsPath |> Location.Abs
-    | false -> str |> RelPath |> Location.Rel
-
-let toFileLocation =  toLocation >> FileLocation
-
-let toDirLocation = toLocation >> FileLocation
+    | false -> str |> RelPath |> Location.Rel

src/Program.fs

@@ -55,7 +55,7 @@ let main argv =
 
     let builder = { GetEdges = Projects.GetProjectDependencies }
 
-    let originProject = argData.ProjectFile |> Paths.toFileLocation  |> Projects.ProjectRef
+    let originProject = argData.ProjectFile |> Paths.toLocation  |> Projects.ProjectRef
 
     let originNode = Graph.Build(builder, originProject)
 

src/Projects.fs

@@ -4,8 +4,8 @@ open System.Xml.Linq
 open BulkAdd.Paths
 open System.IO
 
-type ProjectRef = ProjectRef of FileLocation
-let private getXml(FileLocation location) =
+type ProjectRef = ProjectRef of Location
+let private getXml(location) =
     match location with
     | Abs (AbsPath path) -> XElement.Load path
     | Rel (RelPath path) -> XElement.Load path
@@ -17,14 +17,14 @@ let private getProjectDependencies(projectPath : AbsPath) =
     let (AbsPath projectFilePath) = projectPath
     let projectXml = XElement.Load(projectFilePath)
 
-    let makeReference = Paths.normalize projectPath >> FileLocation >> ProjectRef
+    let makeReference = Paths.normalize projectPath >> ProjectRef
 
     projectXml.Descendants !!"ProjectReference"
     |> Seq.choose (getAttribute !!"Include")
     |> Seq.map (fun attr -> attr.Value |> Paths.toLocation |> makeReference)
     |> Seq.toList
 
-let GetProjectDependencies(ProjectRef (FileLocation location)) =
+let GetProjectDependencies(ProjectRef  location) =
     let pwd = System.Environment.CurrentDirectory |> AbsPath
     match location with
     | Rel relPath -> relPath |> Paths.toAbs pwd |> getProjectDependencies