Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
uva
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Taddeüs Kroes
uva
Commits
252c4068
Commit
252c4068
authored
Nov 29, 2011
by
Taddeus Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
funclang series4: Source code cleanup.
parent
18b75311
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
funclang-taddeus/series4/ass10.ml
funclang-taddeus/series4/ass10.ml
+1
-0
funclang-taddeus/series4/ass8.ml
funclang-taddeus/series4/ass8.ml
+5
-7
No files found.
funclang-taddeus/series4/ass10.ml
View file @
252c4068
...
...
@@ -11,6 +11,7 @@ type expr =
|
Id
of
string
|
Const
of
const
(* Test function that returns converts a typed expression to a string *)
let
rec
eval_expr
=
let
eval_bin_op
=
let
eval_arith_op
=
function
...
...
funclang-taddeus/series4/ass8.ml
View file @
252c4068
...
...
@@ -3,24 +3,23 @@ open List
(* Sort a list l using the quicksort algorithm *)
let
rec
quickSort
(
l
:
int
list
)
=
match
l
with
|
([]
|
[
_
])
->
l
([]
|
[
_
])
->
l
|
pivot
::
rest
->
let
cmp
x
=
x
<
pivot
in
let
low
,
high
=
partition
cmp
rest
in
quickSort
low
@
pivot
::
quickSort
high
;;
(* Sort a list l using the merge sort algorithm *)
let
rec
mergeSort
(
l
:
int
list
)
=
match
l
with
(* If the list is of length 0 or 1, then it is already sorted *)
|
([]
|
[
_
])
->
l
([]
|
[
_
])
->
l
|
_
->
let
rec
merge
a
b
=
match
a
with
|
[]
->
b
[]
->
b
|
ha
::
ta
->
match
b
with
|
[]
->
a
[]
->
a
|
hb
::
tb
->
if
ha
<
hb
then
ha
::
(
merge
ta
b
)
else
hb
::
(
merge
a
tb
)
in
...
...
@@ -30,10 +29,9 @@ let rec mergeSort (l : int list) =
(
left
,
right
)
else
match
left
with
|
[]
->
(
left
,
right
)
[]
->
(
left
,
right
)
(* Put one element of left into right list *)
|
h
::
t
->
split
t
(
h
::
right
)
in
let
left
,
right
=
split
l
[]
in
merge
(
mergeSort
left
)
(
mergeSort
right
)
;;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment