diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-07-27 16:43:48 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-07-27 16:43:48 +0000 |
| commit | 16b94d08ac1196823d7e3daf787b85813ba33e6e (patch) | |
| tree | fad01a7f9ec6822be089e5219a9e2346fd2b55ea /methods | |
| parent | 0626a3d151445530e30869fdb0081340ddb1569d (diff) | |
| download | opt-utilities-16b94d08ac1196823d7e3daf787b85813ba33e6e.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@131 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/lbfgs/arithmetic_ansi.h | 31 | ||||
| -rw-r--r-- | methods/lbfgs/lbfgs.cpp | 6 | ||||
| -rw-r--r-- | methods/lbfgs/lbfgs_method.hpp (renamed from methods/lbfgs/lbfgs.hpp) | 0 |
3 files changed, 5 insertions, 32 deletions
diff --git a/methods/lbfgs/arithmetic_ansi.h b/methods/lbfgs/arithmetic_ansi.h index c58c98a..c071245 100644 --- a/methods/lbfgs/arithmetic_ansi.h +++ b/methods/lbfgs/arithmetic_ansi.h @@ -1,32 +1,5 @@ -/* - * ANSI C implementation of vector operations. - * - * Copyright (c) 2007-2010 Naoaki Okazaki - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND 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. - */ - -/* $Id: arithmetic_ansi.h 65 2010-01-29 12:19:16Z naoaki $ */ - -#include <stdlib.h> -#include <memory.h> +#include <cstdlib> +#include <memory> #if LBFGS_FLOAT == 32 && LBFGS_IEEE_FLOAT #define fsigndiff(x, y) (((*(uint32_t*)(x)) ^ (*(uint32_t*)(y))) & 0x80000000U) diff --git a/methods/lbfgs/lbfgs.cpp b/methods/lbfgs/lbfgs.cpp index d7b5494..6ce9a3b 100644 --- a/methods/lbfgs/lbfgs.cpp +++ b/methods/lbfgs/lbfgs.cpp @@ -1,6 +1,6 @@ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> +#include <cstdio> +#include <cstdlib> +#include <cmath> #include "arithmetic_ansi.h" diff --git a/methods/lbfgs/lbfgs.hpp b/methods/lbfgs/lbfgs_method.hpp index 112d50e..112d50e 100644 --- a/methods/lbfgs/lbfgs.hpp +++ b/methods/lbfgs/lbfgs_method.hpp |