Skip to content

Commit

Permalink
updating copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuel Blum committed Apr 11, 2013
1 parent 77a6852 commit 86442bf
Show file tree
Hide file tree
Showing 42 changed files with 46 additions and 227 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Created by Manuel Blum on 2011-05-25.
# Copyright 2011 University of Freiburg.
# Copyright 2013 University of Freiburg.

CMAKE_MINIMUM_REQUIRED(VERSION 2.8)

Expand Down
4 changes: 0 additions & 4 deletions Sources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ SET(LIBGP_SRC
src/cov_matern3_iso.cc
src/cov_matern5_iso.cc
src/cov_noise.cc
src/cov_rbf_cs.cc
src/cov_rq_iso.cc
src/cov_periodic_matern3_iso.cc
src/cov_se_ard.cc
src/cov_se_iso.cc
src/cov_sum.cc
src/gp.cc
#src/gp_sparse.cc
src/gp_utils.cc
src/sampleset.cc
src/rprop.cc
Expand All @@ -29,14 +27,12 @@ SET(LIBGP_INTERFACES
include/cov_matern3_iso.h
include/cov_matern5_iso.h
include/cov_noise.h
include/cov_rbf_cs.h
include/cov_rq_iso.h
include/cov_periodic_matern3_iso.h
include/cov_se_ard.h
include/cov_se_iso.h
include/cov_sum.h
include/gp.h
#include/gp_sparse.h
include/gp_utils.h
include/sampleset.h
include/rprop.h
Expand Down
4 changes: 4 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# libgp - Gaussian process library for Machine Learning
# Copyright (c) 2013, Manuel Blum <[email protected]>
# All rights reserved.

ADD_EXECUTABLE(gpdense gp_example_dense.cc)
TARGET_LINK_LIBRARIES(gpdense gp)
2 changes: 1 addition & 1 deletion examples/gp_example_dense.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "gp.h"
Expand Down
44 changes: 0 additions & 44 deletions examples/gp_example_sparse.cc

This file was deleted.

8 changes: 1 addition & 7 deletions include/cov.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_H__
Expand Down Expand Up @@ -86,12 +86,6 @@ namespace libgp
/** Draw random target values from this covariance function for input X. */
Eigen::VectorXd draw_random_sample(Eigen::MatrixXd &X);

/** Get distance threshold of this covariance function. */
virtual double get_threshold();

/** Set distance threshold of this covariance function. */
virtual void set_threshold(double threshold);

bool loghyper_changed;

protected:
Expand Down
2 changes: 1 addition & 1 deletion include/cov_factory.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_FACTORY_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_linear_ard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_LINEAR_ARD_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_linear_one.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_LINEAR_ONE__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_matern3_iso.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_MATERN3_ISO_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_matern5_iso.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_MATERN5_ISO_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_noise.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_NOISE_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_periodic_matern3_iso.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_PERIODIC_MATERN3_ISO_H__
Expand Down
37 changes: 0 additions & 37 deletions include/cov_rbf_cs.h

This file was deleted.

2 changes: 1 addition & 1 deletion include/cov_rq_iso.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_RQ_ISO_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_se_ard.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_SE_ARD_H__
Expand Down
2 changes: 1 addition & 1 deletion include/cov_se_iso.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_SE_ISO_H__
Expand Down
4 changes: 1 addition & 3 deletions include/cov_sum.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_SUM_H__
Expand All @@ -22,8 +22,6 @@ namespace libgp
void grad(const Eigen::VectorXd &x1, const Eigen::VectorXd &x2, Eigen::VectorXd &grad);
void set_loghyper(const Eigen::VectorXd &p);
virtual std::string to_string();
virtual double get_threshold();
virtual void set_threshold(double threshold);
private:
size_t param_dim_first;
size_t param_dim_second;
Expand Down
2 changes: 1 addition & 1 deletion include/gp.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

/*!
Expand Down
2 changes: 1 addition & 1 deletion include/gp_utils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __GP_UTILS_H__
Expand Down
2 changes: 1 addition & 1 deletion include/input_dim_filter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __COV_INPUT_DIM_FILTER__
Expand Down
2 changes: 1 addition & 1 deletion include/rprop.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __RPROP_H__
Expand Down
2 changes: 1 addition & 1 deletion include/sampleset.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#ifndef __SAMPLESET_H__
Expand Down
13 changes: 1 addition & 12 deletions src/cov.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov.h"
Expand Down Expand Up @@ -55,15 +55,4 @@ namespace libgp
solver = K.llt();
return solver.matrixL() * y;
}

double CovarianceFunction::get_threshold()
{
return INFINITY;
}

void CovarianceFunction::set_threshold(double threshold)
{
std::cerr << "warning: thresholding is not supported for " << to_string()
<< " covariance function." << std::endl;
}
}
4 changes: 1 addition & 3 deletions src/cov_factory.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include <string>
Expand All @@ -12,7 +12,6 @@
#include "cov_linear_one.h"
#include "cov_se_ard.h"
#include "cov_se_iso.h"
#include "cov_rbf_cs.h"
#include "cov_matern3_iso.h"
#include "cov_matern5_iso.h"
#include "cov_rq_iso.h"
Expand All @@ -28,7 +27,6 @@ namespace libgp {
registry["CovMatern3iso"] = & create_func<CovMatern3iso>;
registry["CovMatern5iso"] = & create_func<CovMatern5iso>;
registry["CovNoise"] = & create_func<CovNoise>;
registry["CovRBFCS"] = & create_func<CovRBFCS>;
registry["CovRQiso"] = & create_func<CovRQiso>;
registry["CovSEard"] = & create_func<CovSEard>;
registry["CovSEiso"] = & create_func<CovSEiso>;
Expand Down
2 changes: 1 addition & 1 deletion src/cov_linear_ard.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_linear_ard.h"
Expand Down
2 changes: 1 addition & 1 deletion src/cov_linear_one.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_linear_one.h"
Expand Down
4 changes: 2 additions & 2 deletions src/cov_matern3_iso.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_matern3_iso.h"
Expand Down Expand Up @@ -47,4 +47,4 @@ namespace libgp
return "CovMatern3iso";
}

}
}
4 changes: 2 additions & 2 deletions src/cov_matern5_iso.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_matern5_iso.h"
Expand Down Expand Up @@ -48,4 +48,4 @@ namespace libgp
return "CovMatern5iso";
}

}
}
2 changes: 1 addition & 1 deletion src/cov_noise.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_noise.h"
Expand Down
2 changes: 1 addition & 1 deletion src/cov_periodic_matern3_iso.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// libgp - Gaussian process library for Machine Learning
// Copyright (c) 2011, Manuel Blum <[email protected]>
// Copyright (c) 2013, Manuel Blum <[email protected]>
// All rights reserved.

#include "cov_periodic_matern3_iso.h"
Expand Down
Loading

0 comments on commit 86442bf

Please sign in to comment.