From 7664e6d090534d629f40991bdc10c20748d586a2 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 17 Mar 2021 20:29:52 +0000 Subject: [PATCH] ml: use OpenCV license header for logistic regression --- modules/ml/src/lr.cpp | 63 +++++------------------------ modules/ml/test/test_lr.cpp | 10 +++-- samples/cpp/logistic_regression.cpp | 59 +-------------------------- 3 files changed, 17 insertions(+), 115 deletions(-) diff --git a/modules/ml/src/lr.cpp b/modules/ml/src/lr.cpp index ad7b8079a2..ed4fb4c720 100644 --- a/modules/ml/src/lr.cpp +++ b/modules/ml/src/lr.cpp @@ -1,57 +1,12 @@ -/////////////////////////////////////////////////////////////////////////////////////// -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. - -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. - -// This is a implementation of the Logistic Regression algorithm in C++ in OpenCV. - -// AUTHOR: -// Rahul Kavi rahulkavi[at]live[at]com - -// # You are free to use, change, or redistribute the code in any way you wish for -// # non-commercial purposes, but please maintain the name of the original author. -// # This code comes with no warranty of any kind. - -// # -// # You are free to use, change, or redistribute the code in any way you wish for -// # non-commercial purposes, but please maintain the name of the original author. -// # This code comes with no warranty of any kind. - -// # Logistic Regression ALGORITHM - - -// License Agreement -// For Open Source Computer Vision Library - -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2008-2011, Willow Garage Inc., all rights reserved. -// Third party copyrights are property of their respective owners. - -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: - -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. - -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. - -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. - -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage. +// This file is part of OpenCV project. +// It is subject to the license terms in the LICENSE file found in the top-level directory +// of this distribution and at http://opencv.org/license.html. +// +// AUTHOR: Rahul Kavi rahulkavi[at]live[at]com + +// +// This is a implementation of the Logistic Regression algorithm +// #include "precomp.hpp" diff --git a/modules/ml/test/test_lr.cpp b/modules/ml/test/test_lr.cpp index d68266cc6f..ec77fcbdda 100644 --- a/modules/ml/test/test_lr.cpp +++ b/modules/ml/test/test_lr.cpp @@ -1,11 +1,13 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html. +// +// AUTHOR: Rahul Kavi rahulkavi[at]live[at]com -// This is a implementation of the Logistic Regression algorithm in C++ in OpenCV. - -// AUTHOR: -// Rahul Kavi rahulkavi[at]live[at]com +// +// Test data uses subset of data from the popular Iris Dataset (1936): +// - http://archive.ics.uci.edu/ml/datasets/Iris +// - https://en.wikipedia.org/wiki/Iris_flower_data_set // #include "test_precomp.hpp" diff --git a/samples/cpp/logistic_regression.cpp b/samples/cpp/logistic_regression.cpp index 4338b61f7b..1bc2bf9711 100644 --- a/samples/cpp/logistic_regression.cpp +++ b/samples/cpp/logistic_regression.cpp @@ -1,60 +1,5 @@ -/*////////////////////////////////////////////////////////////////////////////////////// -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. - -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. - -// This is a implementation of the Logistic Regression algorithm in C++ in OpenCV. - -// AUTHOR: -// Rahul Kavi rahulkavi[at]live[at]com -// - -// contains a subset of data from the popular Iris Dataset (taken from -// "http://archive.ics.uci.edu/ml/datasets/Iris") - -// # You are free to use, change, or redistribute the code in any way you wish for -// # non-commercial purposes, but please maintain the name of the original author. -// # This code comes with no warranty of any kind. - -// # -// # You are free to use, change, or redistribute the code in any way you wish for -// # non-commercial purposes, but please maintain the name of the original author. -// # This code comes with no warranty of any kind. - -// # Logistic Regression ALGORITHM - -// License Agreement -// For Open Source Computer Vision Library - -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2008-2011, Willow Garage Inc., all rights reserved. -// Third party copyrights are property of their respective owners. - -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: - -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. - -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. - -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. - -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage.*/ +// Logistic Regression sample +// AUTHOR: Rahul Kavi rahulkavi[at]live[at]com #include