From 702e9e5df0685b12c9c7b59a1484586c0b6caec6 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 17 Dec 2012 10:37:16 +0000 Subject: [PATCH] Corrected/added headers + copyright info. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6212 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/README.txt | 4 ++- prism/src/parser/ast/ExpressionAction.java | 2 +- prism/src/parser/ast/ExpressionFairness.java | 2 +- prism/src/parser/type/TypeVoid.java | 2 +- prism/src/prism/DRA.java | 2 +- prism/src/prism/MultiObjUtils.java | 26 ++++++++++++++++ prism/src/prism/NativeIntArray.cc | 2 +- prism/src/prism/NativeIntArray.java | 30 +++++++++++++++++-- prism/src/prism/NondetModelChecker.java | 2 ++ prism/src/prism/Operator.java | 28 +++++++++++++++-- prism/src/prism/OpsAndBoundsList.java | 26 ++++++++++++++++ .../PermutedLexicographicComparator.java | 26 ++++++++++++++++ prism/src/prism/Point.java | 26 ++++++++++++++++ prism/src/prism/Tile.java | 26 ++++++++++++++++ prism/src/prism/TileList.java | 26 ++++++++++++++++ prism/src/sparse/NDSparseMatrix.java | 29 ++++++++++++++++-- prism/src/sparse/PS_NondetMultiObj.cc | 2 +- prism/src/sparse/PS_NondetMultiObjGS.cc | 2 +- prism/src/sparse/sparse_adv.cc | 2 +- 19 files changed, 248 insertions(+), 17 deletions(-) diff --git a/prism/README.txt b/prism/README.txt index 56b8f666..dd012a12 100644 --- a/prism/README.txt +++ b/prism/README.txt @@ -82,8 +82,10 @@ PRISM was created and is still actively maintained by: We gratefully acknowledge contributions to the PRISM code-base from various sources, including (in approximately reverse chronological order): + * Vojtech Forejt: Various model checking code, including multi-objective + GUI enhancements + * Hongyang Qu: Multi-objective model checking * Mateusz Ujma: Bug fixes and GUI improvements - * Vojtech Forejt: Symbolic/explicit-state model checking, GUI enhancements + * Christian von Essen: Symbolic/explicit-state model checking * Vincent Nimal: Approximate (simulation-based) model checking techniques * Mark Kattenbelt: Wide range of enhancements/additions, especially in the GUI * Carlos Bederian (working with Pedro D'Argenio): LTL model checking for MDPs diff --git a/prism/src/parser/ast/ExpressionAction.java b/prism/src/parser/ast/ExpressionAction.java index ab7eb1fd..c75a4e24 100644 --- a/prism/src/parser/ast/ExpressionAction.java +++ b/prism/src/parser/ast/ExpressionAction.java @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Hongyang Qu (University of Oxford) +// * Hongyang Qu (University of Oxford) // * Dave Parker (University of Oxford) // //------------------------------------------------------------------------------ diff --git a/prism/src/parser/ast/ExpressionFairness.java b/prism/src/parser/ast/ExpressionFairness.java index f8316012..e361f31a 100644 --- a/prism/src/parser/ast/ExpressionFairness.java +++ b/prism/src/parser/ast/ExpressionFairness.java @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Hongyang Qu (University of Oxford) +// * Hongyang Qu (University of Oxford) // * Dave Parker (University of Oxford) // //------------------------------------------------------------------------------ diff --git a/prism/src/parser/type/TypeVoid.java b/prism/src/parser/type/TypeVoid.java index 2803b01d..ad4b5546 100644 --- a/prism/src/parser/type/TypeVoid.java +++ b/prism/src/parser/type/TypeVoid.java @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Dave Parker (University of Oxford) +// * Vojtech Forejt (University of Oxford) // //------------------------------------------------------------------------------ // diff --git a/prism/src/prism/DRA.java b/prism/src/prism/DRA.java index 63db1f29..9ca8bdcd 100644 --- a/prism/src/prism/DRA.java +++ b/prism/src/prism/DRA.java @@ -3,7 +3,7 @@ // Copyright (c) 2002- // Authors: // * Dave Parker (University of Oxford) -// * Hongyang Qu (University of Oxford) +// * Hongyang Qu (University of Oxford) // //------------------------------------------------------------------------------ // diff --git a/prism/src/prism/MultiObjUtils.java b/prism/src/prism/MultiObjUtils.java index c8d29de1..37a266b2 100644 --- a/prism/src/prism/MultiObjUtils.java +++ b/prism/src/prism/MultiObjUtils.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.io.File; diff --git a/prism/src/prism/NativeIntArray.cc b/prism/src/prism/NativeIntArray.cc index 04f1d4af..2dfd6e43 100644 --- a/prism/src/prism/NativeIntArray.cc +++ b/prism/src/prism/NativeIntArray.cc @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Dave Parker (University of Oxford) +// * Vojtech Forejt (University of Oxford) // //------------------------------------------------------------------------------ // diff --git a/prism/src/prism/NativeIntArray.java b/prism/src/prism/NativeIntArray.java index b09107ba..28106364 100644 --- a/prism/src/prism/NativeIntArray.java +++ b/prism/src/prism/NativeIntArray.java @@ -1,9 +1,33 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; /** - * This class can be used to store {@code int} elements in an array. - * @author vojfor - * + * Class to store {@code int} elements in an array. */ public class NativeIntArray { diff --git a/prism/src/prism/NondetModelChecker.java b/prism/src/prism/NondetModelChecker.java index c26b01d4..7171f5fd 100644 --- a/prism/src/prism/NondetModelChecker.java +++ b/prism/src/prism/NondetModelChecker.java @@ -3,6 +3,8 @@ // Copyright (c) 2002- // Authors: // * Dave Parker (University of Oxford, formerly University of Birmingham) +// * Vojtech Forejt (University of Oxford) +// * Hongyang Qu (University of Oxford) // * Carlos S. Bederian (Universidad Nacional de Cordoba) // //------------------------------------------------------------------------------ diff --git a/prism/src/prism/Operator.java b/prism/src/prism/Operator.java index 6fe3abe4..f936a673 100644 --- a/prism/src/prism/Operator.java +++ b/prism/src/prism/Operator.java @@ -1,6 +1,30 @@ -package prism; +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== -import sun.awt.image.OffScreenImage; +package prism; /** * Enumeration that represents one of the operators used in multi-objective diff --git a/prism/src/prism/OpsAndBoundsList.java b/prism/src/prism/OpsAndBoundsList.java index 3e18bf89..d91ff2c0 100644 --- a/prism/src/prism/OpsAndBoundsList.java +++ b/prism/src/prism/OpsAndBoundsList.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.util.ArrayList; diff --git a/prism/src/prism/PermutedLexicographicComparator.java b/prism/src/prism/PermutedLexicographicComparator.java index 814dc9db..61ac9314 100644 --- a/prism/src/prism/PermutedLexicographicComparator.java +++ b/prism/src/prism/PermutedLexicographicComparator.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.util.Arrays; diff --git a/prism/src/prism/Point.java b/prism/src/prism/Point.java index e6f55143..2a9a15ba 100644 --- a/prism/src/prism/Point.java +++ b/prism/src/prism/Point.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.util.ArrayList; diff --git a/prism/src/prism/Tile.java b/prism/src/prism/Tile.java index c0a3622f..d9c33fee 100644 --- a/prism/src/prism/Tile.java +++ b/prism/src/prism/Tile.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.util.ArrayList; diff --git a/prism/src/prism/TileList.java b/prism/src/prism/TileList.java index cf33559f..6157e3a4 100644 --- a/prism/src/prism/TileList.java +++ b/prism/src/prism/TileList.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package prism; import java.text.DecimalFormat; diff --git a/prism/src/sparse/NDSparseMatrix.java b/prism/src/sparse/NDSparseMatrix.java index 4a300fc8..6e2e65f7 100644 --- a/prism/src/sparse/NDSparseMatrix.java +++ b/prism/src/sparse/NDSparseMatrix.java @@ -1,3 +1,29 @@ +//============================================================================== +// +// Copyright (c) 2002- +// Authors: +// * Vojtech Forejt (University of Oxford) +// +//------------------------------------------------------------------------------ +// +// This file is part of PRISM. +// +// PRISM is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// PRISM is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PRISM; if not, write to the Free Software Foundation, +// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//============================================================================== + package sparse; import jdd.JDDNode; @@ -7,8 +33,6 @@ import prism.PrismException; /** * A wrapper class around a native sparse matrix. - * @author vojfor - * */ public class NDSparseMatrix { @@ -56,7 +80,6 @@ public class NDSparseMatrix return ptr; } - /** * Deletes the matrix */ diff --git a/prism/src/sparse/PS_NondetMultiObj.cc b/prism/src/sparse/PS_NondetMultiObj.cc index b3474723..f2a89602 100644 --- a/prism/src/sparse/PS_NondetMultiObj.cc +++ b/prism/src/sparse/PS_NondetMultiObj.cc @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Hongyang Qu (University of Oxford) +// * Vojtech Forejt (University of Oxford) // * Dave Parker (University of Oxford, formerly University of Birmingham) // //------------------------------------------------------------------------------ diff --git a/prism/src/sparse/PS_NondetMultiObjGS.cc b/prism/src/sparse/PS_NondetMultiObjGS.cc index d5a8b0ae..812a88db 100644 --- a/prism/src/sparse/PS_NondetMultiObjGS.cc +++ b/prism/src/sparse/PS_NondetMultiObjGS.cc @@ -2,7 +2,7 @@ // // Copyright (c) 2002- // Authors: -// * Hongyang Qu (University of Oxford) +// * Vojtech Forejt (University of Oxford) // * Dave Parker (University of Oxford, formerly University of Birmingham) // //------------------------------------------------------------------------------ diff --git a/prism/src/sparse/sparse_adv.cc b/prism/src/sparse/sparse_adv.cc index 2e0f7593..099be7c5 100644 --- a/prism/src/sparse/sparse_adv.cc +++ b/prism/src/sparse/sparse_adv.cc @@ -3,7 +3,7 @@ // Copyright (c) 2002- // Authors: // * Dave Parker (University of Oxford) -// * Hongyang Qu Parker (University of Oxford) +// * Hongyang Qu (University of Oxford) // //------------------------------------------------------------------------------ //