ma: Cleanup bibliography entry types

1 files changed, 96 insertions, 95 deletions

diff --git a/ma/safety_reset.bib b/ma/safety_reset.bib
index 79e6e94..77a0d3b 100644
--- a/ma/safety_reset.bib
+++ b/ma/safety_reset.bib
@@ -219,15 +219,15 @@
   year         = {2019},

 }

 

-@MvBook{bsi-tr-03109-2-a,

+@Misc{bsi-tr-03109-2-a,

   author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

   title        = {TR-03109-2 Anhang A: Smart Meter Gateway Sicherheitsmodul Use Cases},

-  edition      = {v1.1},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

   url          = {https://web.archive.org/web/20190919111540/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2-Sicherheitsmodul_Use_Cases.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

   urldate      = {2019-09-19},

   booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.1},

   month        = dec,

-  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

   year         = {2014},

 }

 

@@ -337,18 +337,19 @@
 	x-color = {#009966},
 	year = {2016}
 }
-
-@journal{lloret01,
-	author = {Jaime Lloret and Jesus Tomas and Alejandro Canovas and Lorena Parra},
-	journaltitle = {IEEE Communications Magazine},
-	organization = {IEEE},
-	pages = {50--57},
-	title = {An Integrated IoT Architecture for Smart Metering},
-	urldate = 2019-09-19,
-	volume = {54},
-	x-color = {#7a783b},
-	year = {2016}
-}
+

+@Article{lloret01,

+  author       = {Jaime Lloret and Jesus Tomas and Alejandro Canovas and Lorena Parra},

+  date         = {2016},

+  journaltitle = {IEEE Communications Magazine},

+  title        = {An Integrated IoT Architecture for Smart Metering},

+  pages        = {50--57},

+  urldate      = {2019-09-19},

+  volume       = {54},

+  organization = {IEEE},

+  x-color      = {#7a783b},

+  year         = {2016},

+}

 
 @article{sharma01,
 	author = {Konark Sharma and Lalit Mohan Saini},
@@ -468,19 +469,19 @@
   x-color      = {#009966},

   year         = {2016},

 }

-
-@datasheet{st-db3636,
-	author = {{ST Microelectronics}},
-	edition = {r1},
-	month = {jun},
-	organization = {ST Microelectronics},
-	subtitle = {Security module of a smart meter gateway as defined by the BSI},
-	title = {STSAFE-J100-BS Data brief},
-	url = {https://www.st.com/resource/en/data_brief/stsafe-j100-bs.pdf},
-	urldate = 2019-09-20,
-	x-color = {#009966},
-	year = {2018}
-}
+

+@Misc{st-db3636,

+  author       = {{ST Microelectronics}},

+  title        = {STSAFE-J100-BS Data brief},

+  organization = {ST Microelectronics},

+  subtitle     = {Security module of a smart meter gateway as defined by the BSI},

+  url          = {https://www.st.com/resource/en/data_brief/stsafe-j100-bs.pdf},

+  urldate      = {2019-09-20},

+  edition      = {r1},

+  month        = {jun},

+  x-color      = {#009966},

+  year         = {2018},

+}

 

 @Online{dalheimer01,

   author     = {Mathias Dalheimer},

@@ -511,7 +512,7 @@
 	year = {2018}
 }
 

-@TechReport{entsoe01,

+@Misc{entsoe01,

   author = {{ENTSO-E System Protection Dynamics and WG}},

   title  = {Oscillation Event 03.12.2017},

   url    = {https://docstore.entsoe.eu/Documents/SOC%20documents/Regional_Groups_Continental_Europe/OSCILLATION_REPORT_SPD.pdf},

@@ -544,7 +545,7 @@
 	year = {1982}
 }
 

-@InCollection{blaze01,

+@InBook{blaze01,

   author    = {Matt Blaze and Joan Feigenbaum and John Ioannidis and Angelos D Keromytis},

   booktitle = {Secure Internet Programming},

   date      = {1999},

@@ -580,22 +581,22 @@
 	year = {2013}
 }
 

-@TechReport{cenelec01,

+@Misc{cenelec01,

   author       = {{The CEN/CENELEC/ETSI Joint Working Group Standards Smart on for Grids}},

   title        = {Final report of the CEN/CENELEC/ETSI Joint Working Group on Standards for Smart Grids},

-  month        = may,

   organization = {CEN/CENELEC/ETSI},

+  month        = may,

   year         = {2011},

 }

-
-@techreport{pariente01,
-	author = {Dillon Pariente and Emmanuel Ledinot},
-	journal = {Formal Verification of Object-Oriented Software},
-	pages = {205-219},
-	publisher = {KIT University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association},
-	title = {Formal verification of industrial C code using Frama-C: a case study},
-	year = {2010}
-}
+

+@Misc{pariente01,

+  author    = {Dillon Pariente and Emmanuel Ledinot},

+  title     = {Formal verification of industrial C code using Frama-C: a case study},

+  journal   = {Formal Verification of Object-Oriented Software},

+  pages     = {205-219},

+  publisher = {KIT University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association},

+  year      = {2010},

+}

 
 @inbook{rogers01,
 	author = {Graham Rogers},
@@ -604,11 +605,11 @@
 	year = {2000}
 }
 

-@Proceedings{grebe01,

+@InProceedings{grebe01,

+  author       = {E. Grebe and J. Kabouris and S. L{\'o}pez Barba and W. Sattinger and W. Winter},

   title        = {Low Frequency Oscillations in the Interconnected System of Continental Europe},

   doi          = {10.1109/PES.2010.5589932 {\textperiodcentered}},

   publisher    = {IEEE},

-  author       = {E. Grebe and J. Kabouris and S. L{\'o}pez Barba and W. Sattinger and W. Winter},

   journaltitle = {IEEE PES General Meeting},

   month        = aug,

   year         = {2010},

@@ -667,16 +668,16 @@
 	volume = {31},
 	year = {2013}
 }
-
-@proceedings{fraunholz01,
-	author = {Daniel Fraunholz and Simon {Duque Anton} and Hans Dieter Schotten},
-	journaltitle = {2017 25th International Conference on Software, Telecommunications and Computer Networks (SoftCOM)},
-	month = nov,
-	publisher = {IEEE},
-	title = {Introducing GAMfIS: A Generic Attacker Model for Information Security},
-	url = {https://doi.org/10.23919/SOFTCOM.2017.8115550},
-	year = {2017}
-}
+

+@InProceedings{fraunholz01,

+  author       = {Daniel Fraunholz and Simon {Duque Anton} and Hans Dieter Schotten},

+  title        = {Introducing GAMfIS: A Generic Attacker Model for Information Security},

+  publisher    = {IEEE},

+  url          = {https://doi.org/10.23919/SOFTCOM.2017.8115550},

+  journaltitle = {2017 25th International Conference on Software, Telecommunications and Computer Networks (SoftCOM)},

+  month        = nov,

+  year         = {2017},

+}

 
 @online{nytimes01,
 	author = {Andrew E. Kramer},
@@ -752,11 +753,11 @@
   publisher = {Springer},

 }

 

-@TechReport{lamport02,

+@Misc{lamport02,

   author      = {Lamport, Leslie},

   date        = {19},

-  institution = {Technical Report CSL-98, SRI International},

   title       = {Constructing digital signatures from a one-way function},

+  institution = {Technical Report CSL-98, SRI International},

   year        = {1979},

 }

 

@@ -793,10 +794,10 @@
   year         = {2005},

 }

 

-@TechReport{gasior01,

+@Misc{gasior01,

   author      = {Gasior, M and Gonzalez, JL},

-  institution = {CERN-AB-Note-2004-021},

   title       = {Improving FFT frequency measurement resolution by parabolic and gaussian interpolation},

+  institution = {CERN-AB-Note-2004-021},

   year        = {2004},

 }

 

@@ -882,7 +883,7 @@
   year   = {2006},

 }

 

-@TechReport{entsoe02,

+@Misc{entsoe02,

   author    = {UCTE/ENTSO-E},

   date      = {2009},

   title     = {Operation Handbook},

@@ -891,14 +892,14 @@
   year      = {2009},

 }

 

-@TechReport{entsoe03,

+@Misc{entsoe03,

   author      = {{ENTSO-E Working Group Incident Classification Scale Under System Operations Committee}},

   date        = {2014},

-  institution = {ENTSO-E},

   title       = {INCIDENTS CLASSIFICATIONSCALEMETHODOLOGY},

+  institution = {ENTSO-E},

 }

 

-@TechReport{entsoe04,

+@Misc{entsoe04,

   author    = {UCTE/ENTSO-E},

   date      = {2004},

   title     = {Operation Handbook},

@@ -924,44 +925,44 @@
   journaltitle = {Proceedings of the 36th International ICSOBA Conference},

 }

 

-@TechReport{ec01,

+@Misc{ec01,

   author      = {Christian Egenhofer and Felice Simonelli and Andrea Renda and Antonella Zarra and William Schmitt and Aurélie Faure and Eleaonor Drabik and Vasileios Rizos and Thomas Hähl and Michèle Koper and Angelica Afanador and Marian Bons},

   date        = {2018},

-  institution = {European Commission, Directorate-General for Internal Market, Industry, Entrepreneurship and SMEs},

   title       = {Composition and Drivers of Energy Prices and Costs: Case Studies in SelectedEnergy Intensive Industries – 2018},

   doi         = {10.2873/937326},

   url         = {https://op.europa.eu/en/publication-detail/-/publication/424dac0a-ec77-11e8-b690-01aa75ed71a1/language-en},

+  institution = {European Commission, Directorate-General for Internal Market, Industry, Entrepreneurship and SMEs},

 }

 

-@TechReport{oye01,

+@Misc{oye01,

   author      = {Harald A. Øye},

   date        = {2012},

-  institution = {27th International Aluminium Conference Metal Bulletin Events},

   title       = {Power Failure, Temporary Pot Shut-Down, Restart and Repair},

   eventtitle  = {27thInternational Aluminium Conference Metal Bulletin Events},

+  institution = {27th International Aluminium Conference Metal Bulletin Events},

 }

 

-@TechReport{ayoub01,

+@Misc{ayoub01,

   author      = {Mohammed W. Ayoub and Francis V. P. Robinson},

   date        = {2013},

-  institution = {{Dubai Aluminium}},

   title       = {A comparative study between diode and thyristor based AC to DC converters for aluminium smelting process},

   doi         = {https://doi.org/10.1109/IEEEGCC.2013.6705851},

   url         = {https://purehost.bath.ac.uk/ws/files/134381670/a_comparative_study_between_diode_and_thyristor_based_AC_to_DC_converters_for_aluminium_smelting_process.pdf},

+  institution = {{Dubai Aluminium}},

 }

 

-@TechReport{wright01,

+@Misc{wright01,

   author      = {Paul S. Wright},

   date        = {2019},

-  institution = {UK National Physical Laboratory},

   title       = {Library of ROCOF Test Waveforms – Pseudo Code, V1.0, May 2019.},

   doi         = {10.5281/zenodo.3559798},

+  institution = {UK National Physical Laboratory},

 }

 

-@TechReport{hp01,

+@Misc{hp01,

   date        = {1997},

-  institution = {Hewlett Packard},

   title       = {Application Note 200-2: Fundamentals of Quartz Oscillators},

+  institution = {Hewlett Packard},

 }

 

 @Online{netze01,

@@ -1009,12 +1010,12 @@
   urldate      = {2020-05-06},

 }

 

-@Report{ec02,

+@Misc{ec02,

   author      = {Frédéric Tounquet and Clément Alaton},

   date        = {2019},

-  institution = {European Commission, Directorate-General for Energy, Directorate B - Internal Energy Market},

   title       = {Benchmarking smart meteringdeployment in the EU-28},

   type        = {resreport},

+  institution = {European Commission, Directorate-General for Energy, Directorate B - Internal Energy Market},

 }

 

 @Online{destatis01,

@@ -1081,12 +1082,12 @@
   urldate = {2020-05-11},

 }

 

-@TechReport{vseaes01,

+@Misc{vseaes01,

   date        = {2010},

-  institution = {{Verband Schweizerischer Elektrizitätsunternehmen VSE}},

   title       = {Branchenempfehlung Strommarkt Schweiz Handbuch Smart Metering CH},

   url         = {https://web.archive.org/web/20130418034458if_/http://www.strom.ch:80/uploads/media/HBSM-CH_1018d_2010.pdf},

   urldate     = {2020-05-12},

+  institution = {{Verband Schweizerischer Elektrizitätsunternehmen VSE}},

 }

 

 @Article{geelen01,

@@ -1192,12 +1193,12 @@
   year         = {2014},

 }

 

-@TechReport{semerow01,

+@Misc{semerow01,

   author      = {Anatoli Semerow and Sebastian Hohn and Matthias Luther and Walter Sattinger and Hans Abildgaard and Agustin Diaz Garcia and Giorgio Giannuzzi},

   date        = {2015},

-  institution = {{University of Erlangen-Nuremberg} and ENTSO-E},

   title       = {Dynamic Study Model for the interconnected power system of Continental Europe in different simulation tools},

   doi         = {10.1109/ptc.2015.7232578},

+  institution = {{University of Erlangen-Nuremberg} and ENTSO-E},

   year        = {2015},

 }

 

@@ -1238,62 +1239,62 @@
   subtitle  = {Specifications, Requirements and Technologies},

 }

 

-@Report{ec03,

+@Misc{ec03,

   date        = {2014},

-  institution = {European Commission},

   title       = {Single Market Progress Report: Country Profiles – Italy},

   type        = {resreport},

   url         = {https://ec.europa.eu/energy/sites/ener/files/documents/2014_countryreports_italy.pdf},

   urldate     = {2020-05-18},

+  institution = {European Commission},

 }

 

-@Report{usitc01,

+@Misc{usitc01,

   author      = {Lisa Alejandro and Caitlin Blair and Laura Bloodgood and Mahnaz Khan and Martha Lawless and Daniel Meehan and Patrick Schneider and Karl Tsuji},

   date        = {2014},

-  institution = {U.S. International Trade Commission},

   title       = {Global Market for Smart Electricity Meters},

-  type        = {resreport},

   subtitle    = {Government Policies Driving Strong Growth},

+  type        = {resreport},

   url         = {https://www.usitc.gov/publications/332/id-037smart_meters_final.pdf},

   urldate     = {2020-05-18},

+  institution = {U.S. International Trade Commission},

 }

 

-@TechReport{toshiba01,

+@Misc{toshiba01,

   author       = {Mitsuhide Ishima and Kiyoyuki Terai and Yoshihiro Ogita},

   date         = {2018},

-  institution  = {Toshiba Energy Systems and Solutions},

   title        = {Construction and Operation of Communication System for Smart Meter System of TEPCO Power Grid, Inc.},

-  pages        = {46-50},

   url          = {https://www.toshiba.co.jp/tech/review/2018/04/73_04pdf/f02.pdf},

   urldate      = {2020-05-18},

+  institution  = {Toshiba Energy Systems and Solutions},

   issue        = {4},

   journaltitle = {Toshiba Review},

+  pages        = {46-50},

   volume       = {73},

 }

 

-@TechReport{ukgov01,

+@Misc{ukgov01,

   date        = {2018},

-  institution = {UK Department for Business, Energy and Industrial Strategy},

   title       = {Smart Metering Implementation Programme Progress Report for 2018},

   url         = {https://www.gov.uk/government/publications/smart-metering-implementation-programme-progress-report-2018},

   urldate     = {2020-05-18},

+  institution = {UK Department for Business, Energy and Industrial Strategy},

 }

 

-@TechReport{ukgov02,

+@Misc{ukgov02,

   date        = {2014},

-  institution = {UK Department of Energy and Climate Change},

   title       = {Smart Metering Implementation ProgrammeSmart Metering Equipment Technical Specifications},

   url         = {https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/381535/SMIP_E2E_SMETS2.pdf},

   urldate     = {2020-05-18},

   version     = {1.58},

+  institution = {UK Department of Energy and Climate Change},

 }

 

-@TechReport{ukgov03,

+@Misc{ukgov03,

   date        = {2016},

-  institution = {UK Department for Business, Energy and Industrial Strategy},

   title       = {Smart Meter Rollout Cost-Benefit Analysis Part I},

   url         = {https://ec.europa.eu/growth/tools-databases/tris/cs/index.cfm/search/?trisaction=search.detail&year=2017&num=350&iLang=EN},

   urldate     = {2020-05-18},

+  institution = {UK Department for Business, Energy and Industrial Strategy},

 }

 

 @Thesis{mahlknecht01,

@@ -1341,22 +1342,22 @@
   volume       = {109},

 }

 

-@TechReport{dsmrp3,

+@Misc{dsmrp3,

   date        = {2014},

-  institution = {Netbeheer Nederland WG DSMR},

   title       = {Dutch Smart Meter Requirements P3 Companion Standard},

   url         = {https://www.netbeheernederland.nl/_upload/Files/Slimme_meter_15_1f3c5c9b2c.pdf},

   urldate     = {2020-05-18},

   version     = {4.0.7},

+  institution = {Netbeheer Nederland WG DSMR},

 }

 

-@TechReport{dsmrp1,

+@Misc{dsmrp1,

   date        = {2016},

-  institution = {Netbeheer Nederland WG DSMR},

   title       = {Dutch Smart Meter Requirements P1 Companion Standard},

   url         = {https://smarty.creos.net/wp-content/uploads/DutchSmartMeterRequirements.pdf},

   urldate     = {2020-05-18},

   version     = {5.0.2},

+  institution = {Netbeheer Nederland WG DSMR},

 }

 

 @InProceedings{anderson01,