From 4a2ebfb43e08f783d31cd2ba373bf20ce9ac01dd Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Sat, 7 Jan 2017 17:55:08 -0500 Subject: [PATCH] Updating copyright year, adding release date to README.md --- LICENSE | 2 +- Makefile | 2 +- README.md | 2 +- include/MIToolbox/ArrayOperations.h | 2 +- include/MIToolbox/CalculateProbability.h | 2 +- include/MIToolbox/Entropy.h | 2 +- include/MIToolbox/MIToolbox.h | 17 ++++++++--------- include/MIToolbox/MutualInformation.h | 2 +- include/MIToolbox/RenyiEntropy.h | 4 +--- include/MIToolbox/RenyiMutualInformation.h | 2 +- include/MIToolbox/WeightedEntropy.h | 2 +- include/MIToolbox/WeightedMutualInformation.h | 2 +- matlab/MIToolboxMex.c | 2 +- matlab/RenyiMIToolboxMex.c | 2 +- matlab/WeightedMIToolboxMex.c | 2 +- src/ArrayOperations.c | 2 +- src/CalculateProbability.c | 2 +- src/Entropy.c | 2 +- src/MutualInformation.c | 2 +- src/RenyiEntropy.c | 2 +- src/RenyiMutualInformation.c | 2 +- src/WeightedEntropy.c | 2 +- src/WeightedMutualInformation.c | 2 +- 23 files changed, 30 insertions(+), 33 deletions(-) diff --git a/LICENSE b/LICENSE index 40c0280..4ee6b3b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ This is MIToolbox, a mutual information package for C/C++ and MATLAB. -Copyright (c) 2010-2015, Adam Pocock, The University of Manchester +Copyright (c) 2010-2017, Adam Pocock, The University of Manchester All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Makefile b/Makefile index e37b353..76ef554 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ #Updated 05/09/2016 - Repackaging # # -#Copyright 2010 Adam Pocock, The University Of Manchester +#Copyright 2010-2017 Adam Pocock, The University Of Manchester #www.cs.manchester.ac.uk # #This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/README.md b/README.md index e7b76d7..5582a25 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ install MIToolbox into /usr/local/lib & /usr/local/include. All code is licensed under the 3-clause BSD license. Update History - - xx/09/2016 - v3.0.0 - Refactored internals to expose integer information theoretic calculations. + - 07/01/2017 - v3.0.0 - Refactored internals to expose integer information theoretic calculations. - 10/01/2016 - v2.1.2 - Relicense from LGPL to BSD. Added checks to ensure input MATLAB types are doubles. - 02/02/2015 - v2.1.1 - Fixed up the Makefile so it installs the headers too. - 22/02/2014 - v2.1 - Fixed a couple of bugs related to memory handling. diff --git a/include/MIToolbox/ArrayOperations.h b/include/MIToolbox/ArrayOperations.h index 9dbca56..6e3c2ae 100644 --- a/include/MIToolbox/ArrayOperations.h +++ b/include/MIToolbox/ArrayOperations.h @@ -9,7 +9,7 @@ ** Created 17/2/2010 ** Updated - 22/02/2014 - Added checking on calloc, and an increment array function. ** -** Copyright 2010,2014 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/CalculateProbability.h b/include/MIToolbox/CalculateProbability.h index 7c227da..f9c0691 100644 --- a/include/MIToolbox/CalculateProbability.h +++ b/include/MIToolbox/CalculateProbability.h @@ -8,7 +8,7 @@ ** Author: Adam Pocock ** Created 17/2/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/Entropy.h b/include/MIToolbox/Entropy.h index e832aea..875499f 100644 --- a/include/MIToolbox/Entropy.h +++ b/include/MIToolbox/Entropy.h @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created 19/2/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/MIToolbox.h b/include/MIToolbox/MIToolbox.h index 46b6fc0..6a7c7ff 100644 --- a/include/MIToolbox/MIToolbox.h +++ b/include/MIToolbox/MIToolbox.h @@ -1,15 +1,14 @@ /******************************************************************************* +** MIToolbox.h +** Provides the header files and #defines to ensure compatibility with MATLAB +** and C/C++. By default it compiles to MATLAB, if COMPILE_C is defined it +** links to the C memory allocation functions. ** -** MIToolbox.h -** Provides the header files and #defines to ensure compatibility with MATLAB -** and C/C++. By default it compiles to MATLAB, if COMPILE_C is defined it -** links to the C memory allocation functions. +** Author: Adam Pocock +** Created: 17/2/2010 +** Modified: 24/06/2011 - added log base #define ** -** Author: Adam Pocock -** Created: 17/2/2010 -** Modified: 24/06/2011 - added log base #define -** -** Copyright 2010/2011 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/MutualInformation.h b/include/MIToolbox/MutualInformation.h index a6d868d..692558e 100644 --- a/include/MIToolbox/MutualInformation.h +++ b/include/MIToolbox/MutualInformation.h @@ -10,7 +10,7 @@ ** Author: Adam Pocock ** Created 19/2/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/RenyiEntropy.h b/include/MIToolbox/RenyiEntropy.h index 6fa491c..be15d1b 100644 --- a/include/MIToolbox/RenyiEntropy.h +++ b/include/MIToolbox/RenyiEntropy.h @@ -9,11 +9,9 @@ ** Author: Adam Pocock ** Created 26/3/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** -** This file is part of MIToolbox. -** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. *******************************************************************************/ diff --git a/include/MIToolbox/RenyiMutualInformation.h b/include/MIToolbox/RenyiMutualInformation.h index 5e2ce5f..b39f1cb 100644 --- a/include/MIToolbox/RenyiMutualInformation.h +++ b/include/MIToolbox/RenyiMutualInformation.h @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created 26/3/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/WeightedEntropy.h b/include/MIToolbox/WeightedEntropy.h index f386a3b..2acb84e 100644 --- a/include/MIToolbox/WeightedEntropy.h +++ b/include/MIToolbox/WeightedEntropy.h @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created: 20/6/2011 ** -** Copyright 2010/2011 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/include/MIToolbox/WeightedMutualInformation.h b/include/MIToolbox/WeightedMutualInformation.h index 837449e..51fd0e8 100644 --- a/include/MIToolbox/WeightedMutualInformation.h +++ b/include/MIToolbox/WeightedMutualInformation.h @@ -11,7 +11,7 @@ ** Author: Adam Pocock ** Created: 20/6/2011 ** -** Copyright 2010/2011 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/matlab/MIToolboxMex.c b/matlab/MIToolboxMex.c index 96a6429..ff6b3c5 100644 --- a/matlab/MIToolboxMex.c +++ b/matlab/MIToolboxMex.c @@ -3,7 +3,7 @@ ** is the MATLAB entry point for the MIToolbox functions when called from ** a MATLAB/OCTAVE script. ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/matlab/RenyiMIToolboxMex.c b/matlab/RenyiMIToolboxMex.c index bdfc9a6..232afda 100644 --- a/matlab/RenyiMIToolboxMex.c +++ b/matlab/RenyiMIToolboxMex.c @@ -3,7 +3,7 @@ ** is the MATLAB entry point for the Renyi Entropy and MI MIToolbox functions ** when called from a MATLAB/OCTAVE script. ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/matlab/WeightedMIToolboxMex.c b/matlab/WeightedMIToolboxMex.c index 5910cd6..7e9af9a 100644 --- a/matlab/WeightedMIToolboxMex.c +++ b/matlab/WeightedMIToolboxMex.c @@ -3,7 +3,7 @@ ** is the MATLAB entry point for the WeightedMIToolbox functions when called ** from a MATLAB/OCTAVE script. ** -** Copyright 2011 Adam Pocock, The University Of Manchester +** Copyright 2011-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/ArrayOperations.c b/src/ArrayOperations.c index 6a50a00..e12eb68 100644 --- a/src/ArrayOperations.c +++ b/src/ArrayOperations.c @@ -9,7 +9,7 @@ ** Created 17/2/2010 ** Updated - 22/02/2014 - Added checking on calloc. ** - ** Copyright 2010,2014 Adam Pocock, The University Of Manchester + ** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/CalculateProbability.c b/src/CalculateProbability.c index ae2fe1f..5da0602 100644 --- a/src/CalculateProbability.c +++ b/src/CalculateProbability.c @@ -10,7 +10,7 @@ ** Modified - 04/07/2011 - added weighted probability functions ** Updated - 22/02/2014 - Added checking on calloc. ** -** Copyright 2010-2014 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/Entropy.c b/src/Entropy.c index 817b96e..060f7f6 100644 --- a/src/Entropy.c +++ b/src/Entropy.c @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created 19/2/2010 ** - ** Copyright 2010 Adam Pocock, The University Of Manchester + ** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/MutualInformation.c b/src/MutualInformation.c index 5d2a10b..c4942f7 100644 --- a/src/MutualInformation.c +++ b/src/MutualInformation.c @@ -11,7 +11,7 @@ ** Created 19/2/2010 ** Updated - 22/02/2014 - Added checking on calloc. ** -** Copyright 2010-2014 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/RenyiEntropy.c b/src/RenyiEntropy.c index ebfb0b2..b633473 100644 --- a/src/RenyiEntropy.c +++ b/src/RenyiEntropy.c @@ -10,7 +10,7 @@ ** Created 26/3/2010 ** Updated - 22/02/2014 - Added checking on calloc. ** -** Copyright 2010-2014 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/RenyiMutualInformation.c b/src/RenyiMutualInformation.c index 9446e36..59f93ae 100644 --- a/src/RenyiMutualInformation.c +++ b/src/RenyiMutualInformation.c @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created 26/3/2010 ** -** Copyright 2010 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/WeightedEntropy.c b/src/WeightedEntropy.c index c6dd335..58242e1 100644 --- a/src/WeightedEntropy.c +++ b/src/WeightedEntropy.c @@ -9,7 +9,7 @@ ** Author: Adam Pocock ** Created: 20/06/2011 ** -** Copyright 2010/2011 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license. diff --git a/src/WeightedMutualInformation.c b/src/WeightedMutualInformation.c index f5bda17..bbcfae0 100644 --- a/src/WeightedMutualInformation.c +++ b/src/WeightedMutualInformation.c @@ -11,7 +11,7 @@ ** Author: Adam Pocock ** Created: 20/06/2011 ** -** Copyright 2010/2011 Adam Pocock, The University Of Manchester +** Copyright 2010-2017 Adam Pocock, The University Of Manchester ** www.cs.manchester.ac.uk ** ** This file is part of MIToolbox, licensed under the 3-clause BSD license.