Skip to content

Commit

Permalink
Merge pull request #7 from jvivian/fix-processing-bugs-after-file-update
Browse files Browse the repository at this point in the history 
Update codebase to handle new data, fix normalization
  • Loading branch information
@jvivian
jvivian authored Jan 22, 2024
2 parents beb8810 + 0559c7a commit d965469
Show file tree
Hide file tree
Showing 16 changed files with 41,650 additions and 39,678 deletions.
Binary file modified .coverage
View file
Binary file not shown.
58 changes: 29 additions & 29 deletions coverage.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<coverage version="7.3.1" timestamp="1703026094115" lines-valid="165" lines-covered="147" line-rate="0.8909" branches-valid="54" branches-covered="49" branch-rate="0.9074" complexity="0">
<coverage version="7.3.1" timestamp="1705032760490" lines-valid="165" lines-covered="147" line-rate="0.8909" branches-valid="54" branches-covered="49" branch-rate="0.9074" complexity="0">
<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.3.1 -->
<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
<sources>
<source>/home/jvivian/covid19-drDFM/covid19_drdfm</source>
<source>/Users/jvivian/Library/CloudStorage/[email protected]/My Drive/projects/covid19-drDFM/covid19_drdfm</source>
</sources>
<packages>
<package name="." line-rate="0.8909" branch-rate="0.9074" complexity="0">
Expand Down Expand Up @@ -136,49 +136,49 @@
<line number="33" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="34" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="35" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="51" hits="1"/>
<line number="53" hits="1"/>
<line number="54" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="55" hits="1"/>
<line number="56" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="57" hits="1"/>
<line number="58" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="59" hits="1"/>
<line number="60" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="61" hits="1"/>
<line number="63" hits="1"/>
<line number="66" hits="1"/>
<line number="72" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="73" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="76" hits="1"/>
<line number="85" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="96" hits="1"/>
<line number="105" hits="1"/>
<line number="64" hits="1"/>
<line number="70" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="71" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="74" hits="1"/>
<line number="83" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="94" hits="1"/>
<line number="103" hits="1"/>
<line number="104" hits="1"/>
<line number="105" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="106" hits="1"/>
<line number="107" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="107" hits="1"/>
<line number="108" hits="1"/>
<line number="109" hits="1"/>
<line number="109" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="110" hits="1"/>
<line number="111" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="112" hits="1"/>
<line number="113" hits="1"/>
<line number="116" hits="1"/>
<line number="125" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="126" hits="1"/>
<line number="127" hits="1"/>
<line number="130" hits="1"/>
<line number="139" hits="1"/>
<line number="142" hits="1"/>
<line number="111" hits="1"/>
<line number="114" hits="1"/>
<line number="123" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="124" hits="1"/>
<line number="125" hits="1"/>
<line number="128" hits="1"/>
<line number="137" hits="1"/>
<line number="140" hits="1"/>
<line number="153" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="155" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="157" hits="1" branch="true" condition-coverage="100% (2/2)"/>
<line number="159" hits="1"/>
<line number="160" hits="1"/>
<line number="163" hits="1"/>
<line number="157" hits="1"/>
<line number="158" hits="1"/>
<line number="161" hits="1"/>
<line number="170" hits="1"/>
<line number="172" hits="1"/>
<line number="174" hits="1"/>
<line number="175" hits="1"/>
<line number="176" hits="1"/>
<line number="177" hits="1"/>
<line number="178" hits="1"/>
<line number="179" hits="1"/>
<line number="180" hits="1"/>
</lines>
</class>
<class name="scm.py" filename="scm.py" complexity="0" line-rate="0" branch-rate="1">
Expand Down
14 changes: 7 additions & 7 deletions covid19_drdfm/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"Pandemic_10": "Deaths3",
"Pandemic_11": "Deaths4",
"Pandemic_12": "Deaths5",
"Pandemic_Response_1": "Vax1",
"proportion_vax": "Vax1",
"Pandemic_Response_2": "Vax2",
"Pandemic_Response_3": "Vax3",
"Administered": "Vax3",
"Pandemic_Response_4": "Gather1",
"Pandemic_Response_5": "Gather2",
"Pandemic_Response_6": "Gather3",
Expand All @@ -26,11 +26,11 @@
"Pandemic_Response_13": "ARP",
"Pandemic_Response_14": "PPP",
"Pandemic_Response_15": "CARES",
"Demand_1": "Cons1",
"Demand_2": "Cons2",
"Demand_3": "Cons3",
"Demand_4": "Cons4",
"Demand_5": "Cons5",
"Consumption": "Cons1",
"TG_Consumption": "Cons2",
"DG_Consumption": "Cons3",
"NDG_Consumption": "Cons4",
"S_Consumption": "Cons5",
"Demand_6": "Employment1",
"Demand_7": "Employment2",
"GDP": "GDP",
Expand Down
Loading

0 comments on commit d965469

Please sign in to comment.