Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Jon Shahen
mohawk-t-conversion-tool
Commits
444d9788
Commit
444d9788
authored
Jan 26, 2015
by
Jonathan Shahen
Browse files
Fixed formating bug in ASAPTime NSA (there was a t in the query that shouldn't be there)
Added debugging messages
parent
0c828d26
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
src/mohawk/converter/generated/mohawktarbac.g4
src/mohawk/converter/generated/mohawktarbac.g4
+1
-0
src/mohawk/converter/to/asaptime/ASAPTimeNSATemplate.st
src/mohawk/converter/to/asaptime/ASAPTimeNSATemplate.st
+1
-1
src/mohawk/converter/to/asaptime/ConvertToASAPTimeNSA.java
src/mohawk/converter/to/asaptime/ConvertToASAPTimeNSA.java
+11
-2
No files found.
src/mohawk/converter/generated/mohawktarbac.g4
View file @
444d9788
...
...
@@ -249,6 +249,7 @@ roleArray returns [ArrayList<Role> r] @init {
{$
r
.
add
($
b
.
role
);}
)*
RightBracket
|
a
=
myrole
{$
r
.
add
($
a
.
role
);}
;
timeslotArray
returns
[
ArrayList
<
TimeSlot
>
t
]
@
init
{
...
...
src/mohawk/converter/to/asaptime/ASAPTimeNSATemplate.st
View file @
444d9788
<
!
Conversion
to
ASAPTime
NSA
Input
Format
!>
<
!
!
>
CONFIG
<
numRoles
>
<
numTimeslots
>
GOAL
<
goalRole
>
t
<
goalTimeslot
>
GOAL
<
goalRole
>
<
goalTimeslot
>
<
!
!
>
<
!
can_revoke
3
,
t3
,
true
;
t5
,
14
!>
<
rules_nsa:
{r|<r.ruleType
>
<
if
(
r
.
adminRole
)
><
r
.
adminRole
><
else
>
true
<
endif
>
,
t
<
r
.
adminTime
>
,
<
if
(
r
.
precondition
)
><
r
.
precondition
;
separator=
" & "
><
else
>
true
<
endif
>
;
t
<
r
.
roleTime
>
,
<
r
.
role
><\
n
>
}
>
\ No newline at end of file
src/mohawk/converter/to/asaptime/ConvertToASAPTimeNSA.java
View file @
444d9788
...
...
@@ -24,7 +24,7 @@ import mohawk.global.pieces.reduced.rules.ASAPTimeNSA_Rule;
import
org.stringtemplate.v4.ST
;
public
class
ConvertToASAPTimeNSA
extends
ConvertTo
{
public
static
final
Logger
logger
=
Logger
.
get
Logger
(
"mohawk-converter"
);
public
static
final
Logger
logger
=
Logger
.
get
Global
(
);
@Override
public
String
convert
(
MohawkT
m
,
File
file
,
Boolean
writeToFile
)
{
...
...
@@ -49,6 +49,9 @@ public class ConvertToASAPTimeNSA extends ConvertTo {
rules
.
addAll
(
toASAPTimeNSA_Rules
(
r
,
m
.
roleHelper
,
m
.
timeIntervalHelper
));
}
logger
.
fine
(
"Rules: "
+
m
.
getAllRules
());
logger
.
fine
(
"Reduced Rules: "
+
rules
);
st
.
add
(
"numRoles"
,
m
.
roleHelper
.
size
());
st
.
add
(
"numTimeslots"
,
m
.
timeIntervalHelper
.
sizeReduced
());
st
.
add
(
"goalRole"
,
query
.
goalRole
);
...
...
@@ -144,8 +147,12 @@ public class ConvertToASAPTimeNSA extends ConvertTo {
precondition
.
add
(
roleHelper
.
indexOf
(
r
));
}
ASAPTimeNSA_Rule
rule_t
;
logger
.
fine
(
"Timeslots: "
+
timeIntervalHelper
.
_timeIntervals
);
logger
.
fine
(
"Reduced Timeslots: "
+
timeIntervalHelper
.
_reducedTimeIntervals
);
logger
.
fine
(
"Admin Interval: "
+
adminInterval
);
logger
.
fine
(
"Role Schedule: "
+
roleSchedule
);
ASAPTimeNSA_Rule
rule_t
;
for
(
Integer
adminTimeslot
:
adminInterval
)
{
for
(
Integer
roleTimeslot
:
roleSchedule
)
{
rule_t
=
new
ASAPTimeNSA_Rule
();
...
...
@@ -161,6 +168,8 @@ public class ConvertToASAPTimeNSA extends ConvertTo {
rule_t
.
precondition
=
precondition
;
rule_t
.
roleTime
=
roleTimeslot
;
logger
.
fine
(
"Adding rule to rules"
);
rules
.
add
(
rule_t
);
}
}
...
...
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