From 6b02d5ba1a949a457afda1749d318becc522a68e Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Mon, 14 Dec 2020 15:17:24 -0500 Subject: [PATCH] Remove excess spaces at end of files --- .travis.yml | 2 +- COPYRIGHT | 2 +- docs/CMakeLists.txt | 2 +- examples/boltzmann2d/boltzmann2d.cc | 2 +- include/kami/random.h | 2 +- include/kami/sequential.h | 12 ++++++------ include/kami/staged.h | 8 ++++---- src/libkami/CMakeLists.txt | 2 +- src/libkami/multigrid3d.cc | 2 +- src/libkami/sequential.cc | 2 +- test/CMakeLists.txt | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 316acec..64daaa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ install: - travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.18.3/cmake-3.18.3-SHA-256.txt.asc # this is optional, but useful: # do a quick md5 check to ensure that the archive we downloaded did not get compromised, leave off GPG verification for now - - sha256sum --ignore-missing -c cmake-3.18.3-SHA-256.txt + - sha256sum --ignore-missing -c cmake-3.18.3-SHA-256.txt # extract the binaries; the output here is quite lengthy, # so we swallow it to not clutter up the travis console - tar -xvf cmake-3.18.3-Linux-x86_64.tar.gz > /dev/null diff --git a/COPYRIGHT b/COPYRIGHT index a845781..b92ccbc 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -19,4 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 5701c92..4726d5d 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -37,7 +37,7 @@ set(SPHINX_INDEX_FILE ${SPHINX_BUILD}/index.html) # - Our doc files have been updated # - The Sphinx config has been updated add_custom_command(OUTPUT ${SPHINX_INDEX_FILE} - COMMAND + COMMAND ${SPHINX_EXECUTABLE} -b html # Tell Breathe where to find the Doxygen output -Dbreathe_projects.kami=${DOXYGEN_OUTPUT_DIR}/xml diff --git a/examples/boltzmann2d/boltzmann2d.cc b/examples/boltzmann2d/boltzmann2d.cc index 5b04bfa..99418d5 100644 --- a/examples/boltzmann2d/boltzmann2d.cc +++ b/examples/boltzmann2d/boltzmann2d.cc @@ -124,7 +124,7 @@ void MoneyAgent::prinfo(void) const { BoltzmannWealthModel::BoltzmannWealthModel(unsigned int numberAgents, unsigned int lengthX, unsigned int lengthY, unsigned int seed) { world = new MultiGrid2D(lengthX, lengthY, true, true); - if(seed == 0) + if(seed == 0) sched = new RandomScheduler(this); else sched = new RandomScheduler(this, seed); diff --git a/include/kami/random.h b/include/kami/random.h index 267388e..290bcf3 100644 --- a/include/kami/random.h +++ b/include/kami/random.h @@ -91,7 +91,7 @@ class LIBKAMI_EXPORT TwoActionRandomScheduler : public RandomScheduler { /// \details This method will randomize the list of TwoActionAgents in the /// scheduler's internal queue and then execute the `TwoActionAgent::stepA()` /// method for every TwoActionAgent assigned to this scheduler in the - /// randomized order, then execute the `TwoActionAgent::stepB()` method for every + /// randomized order, then execute the `TwoActionAgent::stepB()` method for every // TwoActionAgent assigned to this scheduler in the randomized order, void step(); }; diff --git a/include/kami/sequential.h b/include/kami/sequential.h index ed54864..7e95a9f 100644 --- a/include/kami/sequential.h +++ b/include/kami/sequential.h @@ -37,15 +37,15 @@ namespace kami { /// \brief Will execute all agent steps in a sequential order. -/// \details A sequential scheduler will iterate over the agents assigned -/// to the scheduler and call their `step()` function in a sequential order. +/// \details A sequential scheduler will iterate over the agents assigned +/// to the scheduler and call their `step()` function in a sequential order. /// That order is preserved between calls to `step()` but may be modified by /// `addAgent()` or `deleteAgent()`. /// \pre First create a Model for the scheduler to live in. class LIBKAMI_EXPORT SequentialScheduler : public Scheduler { public: - /// \brief Constructor. - /// \details The Model parameter is used by the scheduler to get + /// \brief Constructor. + /// \details The Model parameter is used by the scheduler to get /// access to an Agent. The Model is presumed to maintain a master /// list of all Agents in the Model and the Model can be queried for /// a reference to any particular Agent at `step()` time. @@ -65,8 +65,8 @@ class LIBKAMI_EXPORT SequentialScheduler : public Scheduler { void deleteAgent(AgentID oldAgentID); /// \brief Execute a single time step. - /// \details This method will step through the list of Agents in the - /// scheduler's internal queue and then execute the `Agent::step()` + /// \details This method will step through the list of Agents in the + /// scheduler's internal queue and then execute the `Agent::step()` /// method for every Agent assigned to this scheduler in the order /// assigned. void step(); diff --git a/include/kami/staged.h b/include/kami/staged.h index 86ff41b..159f1cc 100644 --- a/include/kami/staged.h +++ b/include/kami/staged.h @@ -37,15 +37,15 @@ namespace kami { /// \brief Will execute all agent steps in a sequential order. -/// \details A sequential scheduler will iterate over the agents assigned -/// to the scheduler and call their `step()` function in a sequential order. +/// \details A sequential scheduler will iterate over the agents assigned +/// to the scheduler and call their `step()` function in a sequential order. /// That order is preserved between calls to `step()` but may be modified by /// `addAgent()` or `deleteAgent()`. /// \pre First create a Model for the scheduler to live in. class LIBKAMI_EXPORT StagedScheduler : public Scheduler { public: - /// \brief Constructor. - /// \details The Model parameter is used by the scheduler to get + /// \brief Constructor. + /// \details The Model parameter is used by the scheduler to get /// access to an Agent. The Model is presumed to maintain a master /// list of all Agents in the Model and the Model can be queried for /// a reference to any particular Agent at `step()` time. diff --git a/src/libkami/CMakeLists.txt b/src/libkami/CMakeLists.txt index 9efc6ae..1eb8d1f 100644 --- a/src/libkami/CMakeLists.txt +++ b/src/libkami/CMakeLists.txt @@ -33,7 +33,7 @@ create_library(NAME libkami configure_file( "${CMAKE_SOURCE_DIR}/include/kami/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/config.h") - + set_target_properties(libkami PROPERTIES VERSION ${KAMI_VERSION_STRING} SOVERSION ${KAMI_VERSION_MAJOR} OUTPUT_NAME kami) diff --git a/src/libkami/multigrid3d.cc b/src/libkami/multigrid3d.cc index 74a1e94..5eefac6 100644 --- a/src/libkami/multigrid3d.cc +++ b/src/libkami/multigrid3d.cc @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020 The Johns Hopkins University Applied Physics + * Copyright (c) 2020 The Johns Hopkins University Applied Physics * Laboratory LLC * * Permission is hereby granted, free of charge, to any person diff --git a/src/libkami/sequential.cc b/src/libkami/sequential.cc index 4a15965..a26d9b2 100644 --- a/src/libkami/sequential.cc +++ b/src/libkami/sequential.cc @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020 The Johns Hopkins University Applied Physics + * Copyright (c) 2020 The Johns Hopkins University Applied Physics * Laboratory LLC * * Permission is hereby granted, free of charge, to any person diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 55b468c..272442a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR) find_package(spdlog) -create_test( NAME +create_test( NAME unit-kami-agentid SOURCES unit-kami-agentid.cc @@ -20,7 +20,7 @@ create_test( NAME PUBLIC_COMPILE_FEATURES ${COVERAGE_FLAGS}) -create_test( NAME +create_test( NAME unit-kami-agent SOURCES unit-kami-agent.cc