Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
WSymb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OTAWA-plugins
WSymb
Commits
d7401985
Commit
d7401985
authored
2 years ago
by
Forget Julien
Browse files
Options
Downloads
Patches
Plain Diff
Compatibility.
parent
95fd6d60
Branches
Branches containing commit
No related tags found
1 merge request
!2
parametric computation works again
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
simplify/abstract_wcet.ml
+1
-3
1 addition, 3 deletions
simplify/abstract_wcet.ml
with
1 addition
and
3 deletions
simplify/abstract_wcet.ml
+
1
−
3
View file @
d7401985
...
@@ -53,8 +53,6 @@ let insert w (wl, last) =
...
@@ -53,8 +53,6 @@ let insert w (wl, last) =
let
cmp
=
fun
x
y
->
-
(
compare
x
y
)
in
let
cmp
=
fun
x
y
->
-
(
compare
x
y
)
in
if
w
>
last
then
if
w
>
last
then
(
List
.
merge
cmp
wl
[
w
]
,
last
)
(* Keep wl sorted decreasingly. *)
(
List
.
merge
cmp
wl
[
w
]
,
last
)
(* Keep wl sorted decreasingly. *)
else
if
w
=
last
then
(
wl
,
last
)
else
(
List
.
merge
cmp
wl
[
last
]
,
w
)
(* w is the new last, ex-last goes into wl *)
else
(
List
.
merge
cmp
wl
[
last
]
,
w
)
(* w is the new last, ex-last goes into wl *)
(* Sum on multi_wcet *)
(* Sum on multi_wcet *)
...
@@ -75,7 +73,7 @@ let sum loops (l1,w1) (l2,w2) =
...
@@ -75,7 +73,7 @@ let sum loops (l1,w1) (l2,w2) =
let
rec
union_mwcet
w1
w2
=
let
rec
union_mwcet
w1
w2
=
(* Basically, a point-by-point max. *)
(* Basically, a point-by-point max. *)
match
w1
,
w2
with
match
w1
,
w2
with
|
([]
,
last1
)
,
([]
,
last2
)
->
([]
,
Pervasives
.
max
last1
last2
)
|
([]
,
last1
)
,
([]
,
last2
)
->
([]
,
Stdlib
.
max
last1
last2
)
|
([]
,
last
)
,
w
|
w
,
([]
,
last
)
->
|
([]
,
last
)
,
w
|
w
,
([]
,
last
)
->
if
(
last
>=
hd
w
)
then
(* last is greater than all of w1 *)
if
(
last
>=
hd
w
)
then
(* last is greater than all of w1 *)
([]
,
last
)
([]
,
last
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment