Merging.

0c3318aa · Pedro da Rocha Pinto · befeac99 · fbe4faed · 0c3318aa · 0c3318aa
Commit 0c3318aa authored 9 years ago by Pedro da Rocha Pinto
--- a/.gitignore
+++ b/.gitignore
 _site
 .sass-cache
 .jekyll-metadata
+vendor
+.bundle/config
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,8 @@ gem 'rake'
 gem 'jekyll'

 group :default, :jekyll_plugins do
-  gem 'jekyll-scholar', :git => 'https://github.com/inukshuk/jekyll-scholar.git', :ref => '4ef567dc730e373a9b000c97f210b899cd155e6a'
+#  gem 'jekyll-scholar'
+  gem 'jekyll-scholar', :git => 'https://github.com/edgemaster/jekyll-scholar.git', :branch => 'master'
 end

 group :test do

--- a/Gemfile.lock
+++ b/Gemfile.lock
 GIT
-  remote: https://github.com/inukshuk/jekyll-scholar.git
-  revision: 4ef567dc730e373a9b000c97f210b899cd155e6a
-  ref: 4ef567dc730e373a9b000c97f210b899cd155e6a
+  remote: https://github.com/edgemaster/jekyll-scholar.git
+  revision: b35ce69e6901c8f3cd46455fb600e285ea0977f4
+  branch: master
  specs:
-    jekyll-scholar (5.6.0)
+    jekyll-scholar (5.7.0)
      bibtex-ruby (~> 4.0, >= 4.0.13)
      citeproc-ruby (~> 1.0)
      csl-styles (~> 1.0)

--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Program Specification & Verification Group Website

 [![Dependency Status](https://gemnasium.com/bd81b2aa11ff43417700f75dbd194221.svg)](https://gemnasium.com/6ba7afbbfda9adcba06f007cc565a29a)

-The source code for [this site](http://www-rw.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/www-rw.doc.ic.ac.uk),
+The source code for [this site](http://www-rr.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/www-rw.doc.ic.ac.uk),
 you should have access to edit it if a member of the resource-reasoning group.

 Technical Detail
@@ -48,7 +48,7 @@ Local Testing
 -------------
 If you wish to test the site locally, ensure you have ruby installed, and then initially run:
 ```
-gem install bundle
+gem install bundler
 bundle install
 ```


--- a/_config.yml
+++ b/_config.yml
@@ -14,6 +14,7 @@ exclude:
  - Rakefile
  - .gitlab-ci.yml
  - README.md
+  - vendor

 collections:
  people:

--- a/_people/rochapinto.md
+++ b/_people/rochapinto.md
--- a/index.md
+++ b/index.md
@@ -11,7 +11,8 @@ We have to take shared state that is being changed by multiple threads into acco

 Our research agenda is to develop formal reasoning methods about concurrency with a focus on concurrent program logics.
 Recently, there have been various logics based on separation logic to verify functional correctness of fine-grained concurrent programs.
-We have played a significant role introducing Concurrent Abstract Predicates, the Views framework, TaDA, CoLoSL, Fault-tolerant Concurrent Separation Logic and Total-TaDA.
+We have played a significant role introducing {% cite_details Dinsdale-Young2010Concurrent --text Concurrent Abstract Predicates %}, the {% cite_details Dinsdale-Young2013Views --text Views framework %}, {% cite_details RochaPinto2014TaDA --text TaDA %}, {% cite_details Raad2015CoLoSL --text CoLoSL %}, {% cite_details Ntzik2015Fault --text Fault-tolerant Concurrent Separation Logic %} and {% cite_details RochaPinto2016Modular --text Total-TaDA %}.
 These logics have tackled a range of problems, ranging data abstraction, atomicity abstraction, fault-tolerance, terminal, as well as introducing more modular and compositional ways to reason about concurrent programs.
 We have applied these logics to verify large problems, such as data structures used in databases and java.util.concurrent, as well as specifying file systems.
+
 We aim to continue improving the state-of-the-art with a focus on progress properties, specifying concurrency in POSIX filesystems, continuing improving our logics to tackle more advanced algorithms, and develop automated reasoning tools based on these logics.
--- a/publications.bib
+++ b/publications.bib
@@ -390,7 +390,7 @@ We introduce a program logic for reasoning about a broad subset of JavaScript, i

 @Article{LWPG2005Explicit,
  Title                    = {{Explicit Fusions}},
-  Author                   = {{Lucian Wischik and Philippa Gardner}},
+  Author                   = {Lucian Wischik and Philippa Gardner},
  Journal                  = {Theoretical Computer Science},
  Year                     = {2005},
  Number                   = {3},
@@ -434,7 +434,7 @@ We introduce a program logic for reasoning about a broad subset of JavaScript, i

 @InProceedings{Ntzik2015Fault,
  Title                    = {{Fault-tolerant Resource Reasoning}},
-  Author                   = {Gian Ntzik and Pedro da Rocha Pinto and Philippa Gardner},
+  Author                   = {Gian Ntzik and Pedro {da Rocha Pinto} and Philippa Gardner},
  Booktitle                = {Proceedings of the 13\textsuperscript{th} Asian Symposium on Programming Languages and Systems ({APLAS})},
  Year                     = {2015},
  Note                     = {(Awaiting Publication)$^*$},
@@ -485,7 +485,7 @@ We introduce a program logic for reasoning about a broad subset of JavaScript, i

 @InProceedings{RochaPinto2011Simple,
  Title                    = {{A Simple Abstraction for Complex Concurrent Indexes}},
-  Author                   = {Pedro da Rocha Pinto and Thomas Dinsdale{-}Young and Mike Dodds and Philippa Gardner and Mark J. Wheelhouse},
+  Author                   = {Pedro {da Rocha Pinto} and Thomas Dinsdale{-}Young and Mike Dodds and Philippa Gardner and Mark J. Wheelhouse},
  Booktitle                = {Proceedings of the 26\textsuperscript{th} Annual {ACM} {SIGPLAN} Conference on Object-Oriented Programming, Systems, Languages, and Applications ({OOPSLA})},
  Year                     = {2011},
  Pages                    = {845--864},
@@ -496,7 +496,7 @@ We present an abstract specification for concurrent indexes. We verify several r

 @InProceedings{RochaPinto2014TaDA,
  Title                    = {{TaDA: A Logic for Time and Data Abstraction}},
-  Author                   = {Pedro da Rocha Pinto and Thomas Dinsdale{-}Young and Philippa Gardner},
+  Author                   = {Pedro {da Rocha Pinto} and Thomas Dinsdale{-}Young and Philippa Gardner},
  Booktitle                = {Proceedings of the 28\textsuperscript{th} European Conference on Object-Oriented Programming ({ECOOP})},
  Year                     = {2014},
  Pages                    = {207--231},
@@ -507,7 +507,7 @@ Building on separation logic with concurrent abstract predicates (CAP), we intro

 @InProceedings{RochaPinto2015Steps,
  Title                    = {{Steps in Modular Specifications for Concurrent Modules (Invited Tutorial Paper)}},
-  Author                   = {Pedro da Rocha Pinto and Thomas Dinsdale-Young and Philippa Gardner},
+  Author                   = {Pedro {da Rocha Pinto} and Thomas Dinsdale-Young and Philippa Gardner},
  Booktitle                = {Proceedings of the 31\textsuperscript{st} Conference on the Mathematical Foundations of Programming Semantics},
  Year                     = {2015},

@@ -516,7 +516,7 @@ Building on separation logic with concurrent abstract predicates (CAP), we intro

 @InProceedings{RochaPinto2016Modular,
  Title                    = {Modular Termination Verification for Non-blocking Concurrency},
-  Author                   = {Pedro da Rocha Pinto and Thomas Dinsdale-Young and Philippa Gardner and Julian Sutherland},
+  Author                   = {Pedro {da Rocha Pinto} and Thomas Dinsdale-Young and Philippa Gardner and Julian Sutherland},
  Booktitle                = {Proceedings of the 25\textsuperscript{th} European Symposium on Programming ({ESOP})},
  Year                     = {2016},