Skip to content

Commit b8ad9d0

Browse files
authored
Merge pull request #758 from UWB-Biocomputing/master
[hotfix-issue-756] Apply hotfixes to SharedDevelopment
2 parents 7a50b56 + 62ad162 commit b8ad9d0

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

.github/workflows/format.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ on:
1010
paths:
1111
- '**.cpp'
1212
- '**.h'
13-
branches:
14-
- master
15-
- development
13+
types: [opened, synchronize, reopened]
1614

1715
jobs:
1816
deploy:

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ master,development ]
66
pull_request:
7-
branches: [ master,development ]
7+
types: [opened, synchronize, reopened]
88

99
defaults:
1010
run:

Tools/InputGeneration/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,23 @@ The stream of calls generated is saved to an XML file. This file contains a list
3838
## Input file format
3939

4040
The developer's documentation contains more information about the [simulation input file
41-
format and the class that loads and manages the event inputs]
42-
(https://uwb-biocomputing.github.io/Graphitti/Developer/GraphAndEventInputs.html).
41+
format and the class that loads and manages the event inputs](https://uwb-biocomputing.github.io/Graphitti/Developer/GraphAndEventInputs.html).
4342

4443
Below is an example of a simulation input file:
4544

4645

4746
```XML
48-
?xml version='1.0' encoding='UTF-8'?>
47+
<?xml version='1.0' encoding='UTF-8'?>
4948
<simulator_inputs>
50-
<data description="SPD Calls - Cluster Point Process" clock_tick_size="1" clock_tick_unit="sec">
51-
<vertex id="194" name="SEATTLE PD Caller region">
52-
<event time="12" duration="568" x="-122.43656117361931" y="47.604800151342786" type="Law" vertex_id="194"/>
53-
<event time="99" duration="36" x="-122.43611438152655" y="47.5321990385178" type="EMS" vertex_id="194"/>
54-
<event time="336" duration="100" x="-122.34868883298704" y="47.56973909330686" type="Law" vertex_id="194"/>
55-
<event time="601" duration="367" x="-122.44122311134316" y="47.70298531339788" type="Law" vertex_id="194"/>
56-
<event time="766" duration="96" x="-122.28084792007573" y="47.70594997190379" type="Fire" vertex_id="194"/>
49+
<data description="SYNTH_OUTPUT2 Calls - Cluster Point Process" clock_tick_size="1" clock_tick_unit="sec">
50+
<vertex id="4" name="UNKNOWN">
51+
<event time="26" duration="38" x="13.111984735748287" y="62.57456126541278" type="Law" patience="54" on_site_time="33" vertex_id="4"/>
52+
<event time="35" duration="30" x="13.101924628231098" y="62.5788162451589" type="Fire" patience="2" on_site_time="12" vertex_id="4"/>
53+
<event time="60" duration="48" x="13.103238844738144" y="62.57852864894537" type="Fire" patience="26" on_site_time="71" vertex_id="4"/>
54+
<event time="61" duration="33" x="13.103729766137114" y="62.57884701874643" type="Fire" patience="27" on_site_time="2" vertex_id="4"/>
55+
<event time="74" duration="32" x="13.104050198095443" y="62.578851926237746" type="Fire" patience="23" on_site_time="38" vertex_id="4"/>
56+
<event time="77" duration="41" x="13.125015368211848" y="62.547956222166015" type="EMS" patience="2" on_site_time="239" vertex_id="4"/>
57+
<event time="111" duration="45" x="13.12497529802989" y="62.54820796343649" type="EMS" patience="46" on_site_time="77" vertex_id="4"/>
5758
...
5859
</vertex>
5960
</data>

docs/Developer/GraphAndEventInputs.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,16 @@ The list of events is provided to Graphitti as an XML input file. We couldn't fi
4545
```xml
4646
<?xml version='1.0' encoding='UTF-8'?>
4747
<simulator_inputs>
48-
<data description="SPD_calls_sept2020" clock_tick_size="1" clock_tick_unit="sec">
49-
<vertex id="194" name="SEATTLE PD Caller region">
50-
<event time="0" duration="0" x="-122.38496236371942" y="47.570236838209546" type="EMS"/>
51-
<event time="34" duration="230" x="-122.37482094435583" y="47.64839548276973" type="EMS"/>
52-
<event time="37" duration="169" x="-122.4036487601129" y="47.55833788618255" type="Fire"/>
53-
<event time="42" duration="327" x="-122.38534886929502" y="47.515324716436346" type="Fire"/>
54-
...
48+
<data description="SYNTH_OUTPUT2 Calls - Cluster Point Process" clock_tick_size="1" clock_tick_unit="sec">
49+
<vertex id="4" name="UNKNOWN">
50+
<event time="26" duration="38" x="13.111984735748287" y="62.57456126541278" type="Law" patience="54" on_site_time="33" vertex_id="4"/>
51+
<event time="35" duration="30" x="13.101924628231098" y="62.5788162451589" type="Fire" patience="2" on_site_time="12" vertex_id="4"/>
52+
<event time="60" duration="48" x="13.103238844738144" y="62.57852864894537" type="Fire" patience="26" on_site_time="71" vertex_id="4"/>
53+
<event time="61" duration="33" x="13.103729766137114" y="62.57884701874643" type="Fire" patience="27" on_site_time="2" vertex_id="4"/>
54+
<event time="74" duration="32" x="13.104050198095443" y="62.578851926237746" type="Fire" patience="23" on_site_time="38" vertex_id="4"/>
55+
<event time="77" duration="41" x="13.125015368211848" y="62.547956222166015" type="EMS" patience="2" on_site_time="239" vertex_id="4"/>
56+
<event time="111" duration="45" x="13.12497529802989" y="62.54820796343649" type="EMS" patience="46" on_site_time="77" vertex_id="4"/>
57+
...
5558
<vertex/>
5659
...
5760
<data/>

0 commit comments

Comments
 (0)