Changeset 5999


Ignore:
Timestamp:
12/06/08 20:33:38 (5 years ago)
Author:
wehart
Message:

Merged revisions 5281-5998 via svnmerge from
 https://software.sandia.gov/svn/public/acro/sundry/trunk

........

r5296 | jberry | 2007-12-19 10:22:19 -0700 (Wed, 19 Dec 2007) | 2 lines


Use the multipleRandomizedSensorPlacements correctly.

........

r5376 | lafisk | 2008-05-23 13:56:37 -0600 (Fri, 23 May 2008) | 2 lines


Add link flags for static executables.

........

r5834 | wehart | 2008-11-23 20:01:45 -0700 (Sun, 23 Nov 2008) | 2 lines


Update of Copyright assertions.

........

r5853 | wehart | 2008-11-24 08:42:59 -0700 (Mon, 24 Nov 2008) | 2 lines


Update to change the license on these files to CPL.

........

r5901 | wehart | 2008-12-01 20:32:01 -0700 (Mon, 01 Dec 2008) | 2 lines


Portability fixes for gcc 4.3.1

........

Location:
sundry/stable/1.1
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • sundry/stable/1.1

  • sundry/stable/1.1/src/AppResponseAnalysis.cpp

    r4331 r5999  
    11/*  _________________________________________________________________________ 
    22 * 
    3  *  COLIN: A Common Optimization Library INterface 
    4  *  Copyright (c) 2003, Sandia National Laboratories. 
    5  *  This software is distributed under the GNU Lesser General Public License. 
    6  *  For more information, see the README.html file in the top COLIN directory. 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
    79 *  _________________________________________________________________________ 
    810 */ 
  • sundry/stable/1.1/src/ColinGlobals.cpp

    r4331 r5999  
    11/*  _________________________________________________________________________ 
    22 * 
    3  *  COLIN: A Common Optimization Library INterface 
    4  *  Copyright (c) 2003, Sandia National Laboratories. 
    5  *  This software is distributed under the GNU Lesser General Public License. 
    6  *  For more information, see the README.html file in the top COLIN directory. 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
    79 *  _________________________________________________________________________ 
    810 */ 
  • sundry/stable/1.1/src/Makefile.am

    r5031 r5999  
    66 
    77include ../../../config/MakeMacros.mk 
     8 
     9if BUILD_STATIC_EXECUTABLES 
     10# 
     11#A libtool flag 
     12# 
     13AM_LDFLAGS=@STATIC_FLAGS@ 
     14endif 
    815 
    916bin_PROGRAMS=ufl 
  • sundry/stable/1.1/src/SNLRound.cpp

    r5281 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112#include <map> 
    213#include <math.h> 
     
    5263 
    5364 
    54   table = condProbTable<double*>(fractional_vals, numfrac, numSensors); 
    5565  vector<vector<int> > result =  
    56         multipleRandomizedSensorPlacements(fractional_vals,numfrac,numSensors,  
     66        multipleRandomizedSensorPlacements(x,numSvars,numSensors,  
    5767                                           numIters); 
    5868  for (int i=0; i < numIters; i++) 
  • sundry/stable/1.1/src/VolVolume.cpp

    r5281 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the CPL License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112// Copyright (C) 2000, International Business Machines 
    213// Corporation and others.  All Rights Reserved. 
     14 
     15#include <cstring> 
    316#include <cstdlib> 
    417#include <cstdio> 
  • sundry/stable/1.1/src/ufl.cpp

    r5281 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the CPL License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112// Copyright (C) 2000, International Business Machines 
    213// Corporation and others.  All Rights Reserved. 
  • sundry/stable/1.1/sundry/SMVkernel.h

    r5031 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112// 
    213//  SMVkernel.h 
  • sundry/stable/1.1/sundry/SNLRound.h

    r5281 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112#include <map> 
    213#include <math.h> 
  • sundry/stable/1.1/sundry/VolVolume.h

    r5031 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the CPL License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112// Copyright (C) 2000, International Business Machines 
    213// Corporation and others.  All Rights Reserved. 
     14 
    315#ifndef __VOLUME_HPP__ 
    416#define __VOLUME_HPP__ 
  • sundry/stable/1.1/sundry/sundry.h

    r4519 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
    111 
    212// 
  • sundry/stable/1.1/sundry/ufl.h

    r5031 r5999  
     1/*  _________________________________________________________________________ 
     2 * 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the CPL License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
     9 *  _________________________________________________________________________ 
     10 */ 
     11 
    112// Copyright (C) 2000, International Business Machines 
    213// Corporation and others.  All Rights Reserved. 
     14 
    315#ifndef __UFL_HPP__ 
    416#define __UFL_HPP__ 
     
    820#include <string> 
    921#include <vector> 
     22#include <cstring> 
    1023//#include <map> 
    1124#include <sundry/SMVkernel.h> 
  • sundry/stable/1.1/test/Makefile.am

    r4534 r5999  
    88endif 
    99 
     10if BUILD_STATIC_EXECUTABLES 
     11# 
     12#A libtool flag 
     13# 
     14AM_LDFLAGS=@STATIC_FLAGS@ 
     15endif 
    1016 
    1117TOPINC=$(top_builddir)/include 
  • sundry/stable/1.1/test/namespace.cpp

    r4534 r5999  
    11/*  _________________________________________________________________________ 
    22 * 
    3  *  COLIN: A Common Optimization Library INterface 
    4  *  Copyright (c) 2003, Sandia National Laboratories. 
    5  *  This software is distributed under the GNU Lesser General Public License. 
    6  *  For more information, see the README.html file in the top COLIN directory. 
     3 *  Acro: A Common Repository for Optimizers 
     4 *  Copyright (c) 2008 Sandia Corporation. 
     5 *  This software is distributed under the BSD License. 
     6 *  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, 
     7 *  the U.S. Government retains certain rights in this software. 
     8 *  For more information, see the README.txt file in the top Acro directory. 
    79 *  _________________________________________________________________________ 
    810 */ 
    9  
    1011 
    1112template <class T> 
Note: See TracChangeset for help on using the changeset viewer.