[Rmol-svn-commit] SF.net SVN: rmol:[166] trunk/rmol

[<den...@us...>]

Revision: 166
          http://rmol.svn.sourceforge.net/rmol/?rev=166&view=rev
Author:   denis_arnaud
Date:     2009-03-05 00:50:26 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
[Release 0.17.0] Fixed a few warnings, and re-wrote the RPM specification file, so that it can be delivered (at least) on Fedora Linux distributions.

Modified Paths:
--------------
    trunk/rmol/configure.ac
    trunk/rmol/po/fr.po
    trunk/rmol/rmol/bom/DPOptimiser.cpp
    trunk/rmol/rmol/bom/Demand.cpp
    trunk/rmol/rmol/bom/Emsr.cpp
    trunk/rmol/rmol.spec.in

Property Changed:
----------------
    trunk/rmol/


Property changes on: trunk/rmol
___________________________________________________________________
Modified: svn:ignore
   - autom4te.cache
INSTALL
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
libtool
rmol-config
rmol-html-doc-0.12.0.tar.bz2
rmol-html-doc-0.12.0.tar.gz
rmol.pc
rmol.m4
rmol.spec
config.guess
config.h
config.h.in
config.sub
configure.log
rmol-0.12.0.tar.bz2
rmol-0.12.0.tar.gz
stamp-h1

   + autom4te.cache
INSTALL
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
libtool
rmol-config
rmol-html-doc-0.*.0.tar.bz2
rmol-html-doc-0.*.0.tar.gz
rmol.pc
rmol.m4
rmol.spec
config.guess
config.h
config.h.in
config.sub
configure.log
rmol-0.*.0.tar.bz2
rmol-0.*.0.tar.gz
stamp-h1


Modified: trunk/rmol/configure.ac
===================================================================
--- trunk/rmol/configure.ac	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/configure.ac	2009-03-05 00:50:26 UTC (rev 166)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script
 #-------------------------------------------------------------------
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (C) 2007-2008  Denis Arnaud <den...@us...>])
+AC_COPYRIGHT([Copyright (C) 2007-2009  Denis Arnaud <den...@us...>])
 AC_INIT([RMOL],[0.17.0],[den...@us...],[rmol])
 AC_CONFIG_HEADER([rmol/config.h])
 AC_CONFIG_SRCDIR([rmol/basic/BasConst.cpp])

Modified: trunk/rmol/po/fr.po
===================================================================
--- trunk/rmol/po/fr.po	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/po/fr.po	2009-03-05 00:50:26 UTC (rev 166)
@@ -1261,8 +1261,8 @@
 "\n"
 "Le propri\xE9taire n'est pas modifi\xE9 si manquant.  Le groupe n'est pas modifi\xE9 "
 "si manquant,\n"
-"mais modifi\xE9 au groupe de login implicite si \xAB : \xBB en suivant le "
-"PROPRI\xC9TAIRE symbolique.\n"
+"mais modifi\xE9 au groupe de login implicite si \xAB : \xBB en suivant le PROPRI\xC9TAIRE "
+"symbolique.\n"
 "Le PROPRI\xC9TAIRE et le GROUPE peuvent \xEAtre num\xE9rique ou symbolique.\n"
 
 #: src/chown.c:150
@@ -2038,8 +2038,8 @@
 "\n"
 msgstr ""
 "Produire des morceaux du FICHIER s\xE9par\xE9s par MOD\xC8LE(s) vers les fichiers\n"
-"\xAB xx01 \xBB, \xAB xx02 \xBB, ... et le nombre d'octets de chaque morceau sur la "
-"sortie standard.\n"
+"\xAB xx01 \xBB, \xAB xx02 \xBB, ... et le nombre d'octets de chaque morceau sur la sortie "
+"standard.\n"
 "\n"
 
 #: src/csplit.c:1467
@@ -4930,8 +4930,8 @@
 "s'applique aux\n"
 "                                fichiers non r\xE9cents et FORMAT2 aux fichiers "
 "r\xE9cents;\n"
-"                                si le STYLE est pr\xE9fix\xE9 par \xAB posix- \xBB, "
-"STYLE prend effet\n"
+"                                si le STYLE est pr\xE9fix\xE9 par \xAB posix- \xBB, STYLE "
+"prend effet\n"
 "                                seulement en dehors de la locale POSIX\n"
 "  -t                         trier selon la date de modification:\n"
 "  -T, --tabsize=TAILLE       utiliser la tabulation selon la TAILLE\n"
@@ -6556,8 +6556,7 @@
 "  -C, --copyright                afficher les Droits d'auteur et les "
 "conditions\n"
 "                                 de recopie\n"
-"  -G, --traditional              faire fonctionner \xAB ptx \xBB comme en System "
-"V\n"
+"  -G, --traditional              faire fonctionner \xAB ptx \xBB comme en System V\n"
 "  -F, --flag-truncation=CHA\xCENE   utiliser la CHA\xCENE pour indiquer la "
 "troncation\n"
 "                                 des lignes\n"
@@ -7471,8 +7470,7 @@
 "   ou: %s OPTION\n"
 "Effectuer une pause de NOMBRE de secondes. Le SUFFIXE peut \xEAtre \xAB s \xBB pour "
 "des\n"
-"secondes (par d\xE9faut), \xAB m \xBB pour des  minutes, \xAB h \xBB pour des heures ou \xAB d "
-"\xBB\n"
+"secondes (par d\xE9faut), \xAB m \xBB pour des  minutes, \xAB h \xBB pour des heures ou \xAB d \xBB\n"
 "pour des jours. Contrairement \xE0 la plupart des implantations qui requierent "
 "un\n"
 "nombre entier, ici le NOMBRE peut \xEAtre un nombre arbitraire en virgule "
@@ -8812,8 +8810,7 @@
 "\n"
 msgstr ""
 "\n"
-"Si le premier caract\xE8re de N (le nombre d'octets ou de lignes) est un \xAB + "
-"\xBB,\n"
+"Si le premier caract\xE8re de N (le nombre d'octets ou de lignes) est un \xAB + \xBB,\n"
 "afficher \xE0 partir du Ni\xE8me items depuis le d\xE9but de chaque fichier,\n"
 "autrement, afficher les derniers N items du fichier.\n"
 "N peut avoir un suffixe multiplicateur:\n"
@@ -10119,8 +10116,7 @@
 #~ "warning: unportable BRE: %s: using `^' as the first character\n"
 #~ "of the basic regular expression is not portable; it is being ignored"
 #~ msgstr ""
-#~ "AVERTISSEMENT: BRE non portable: %s: l'utilisation de \xAB ^ \xBB comme "
-#~ "premier\n"
+#~ "AVERTISSEMENT: BRE non portable: %s: l'utilisation de \xAB ^ \xBB comme premier\n"
 #~ "caract\xE8re d'une expression r\xE9guli\xE8re de base n'est pas portable; cela a "
 #~ "\xE9t\xE9 ignor\xE9."
 
@@ -10689,8 +10685,8 @@
 
 #~ msgid "starting page number larger than total number of pages: `%d'"
 #~ msgstr ""
-#~ "Le num\xE9ro de page de d\xE9part est plus grand que le nombre total de pages: "
-#~ "\xAB %d \xBB"
+#~ "Le num\xE9ro de page de d\xE9part est plus grand que le nombre total de pages: \xAB "
+#~ "%d \xBB"
 
 #~ msgid "Page %d"
 #~ msgstr "Page %d"
@@ -12932,8 +12928,7 @@
 #~ "  -S FICHIER     FICHIER existe et est de type \xAB socket \xBB\n"
 #~ "  -t [DF]        descripteur de fichier DF (sortie standard par d\xE9faut)\n"
 #~ "                 est ouvert sur le terminal\n"
-#~ "  -u FICHIER     FICHIER existe et le bit \xAB set-user-ID \xBB, est "
-#~ "initialis\xE9\n"
+#~ "  -u FICHIER     FICHIER existe et le bit \xAB set-user-ID \xBB, est initialis\xE9\n"
 #~ "  -w FICHIER     FICHIER existe et l'\xE9criture y est permise\n"
 #~ "  -x FICHIER     FICHIER existe et ex\xE9cutable\n"
 

Modified: trunk/rmol/rmol/bom/DPOptimiser.cpp
===================================================================
--- trunk/rmol/rmol/bom/DPOptimiser.cpp	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/rmol/bom/DPOptimiser.cpp	2009-03-05 00:50:26 UTC (rev 166)
@@ -48,7 +48,7 @@
       bool protectionChanged = false;
       double nextProtection = 0.0;
       std::vector<double> currentMERVector;
-      double testGradient = 10000;
+      // double testGradient = 10000;
       
       Bucket& currentBucket = ioBucketHolder.getCurrentBucket();
       const double meanDemand = currentBucket.getMean();

Modified: trunk/rmol/rmol/bom/Demand.cpp
===================================================================
--- trunk/rmol/rmol/bom/Demand.cpp	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/rmol/bom/Demand.cpp	2009-03-05 00:50:26 UTC (rev 166)
@@ -7,27 +7,26 @@
 
   // //////////////////////////////////////////////////////////////////////
   Demand::Demand () :
-    _distributionParameters (FldDistributionParameters()), 
-    _yieldRange (FldYieldRange()) {
+    _yieldRange (FldYieldRange()),
+    _distributionParameters (FldDistributionParameters()) {
   }
 
   // //////////////////////////////////////////////////////////////////////
   Demand::Demand (const Demand& iDemand) :
-    _distributionParameters (iDemand.getDistributionParameters()),
-    _yieldRange (iDemand.getYieldRange()) {
+    _yieldRange (iDemand.getYieldRange()),
+    _distributionParameters (iDemand.getDistributionParameters()) {
   }
 
   // //////////////////////////////////////////////////////////////////////
   Demand::Demand (const FldDistributionParameters& iDistributionParameters,
 		  const FldYieldRange& iYieldRange) :
-    _distributionParameters (iDistributionParameters),
-    _yieldRange (iYieldRange) {
+    _yieldRange (iYieldRange),
+    _distributionParameters (iDistributionParameters) {
   }
 
   // //////////////////////////////////////////////////////////////////////
   Demand::~Demand() {
   }
-  
 
   // //////////////////////////////////////////////////////////////////////
   double Demand::getUpperYield() const {

Modified: trunk/rmol/rmol/bom/Emsr.cpp
===================================================================
--- trunk/rmol/rmol/bom/Emsr.cpp	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/rmol/bom/Emsr.cpp	2009-03-05 00:50:26 UTC (rev 166)
@@ -49,7 +49,9 @@
     lEmsrValueList.sort();
     lEmsrValueList.reverse();
 
-    assert (lEmsrValueList.size() >= lCabinCapacity);
+    // Sanity check
+    const int lEmsrValueListSize = lEmsrValueList.size();
+    assert (lEmsrValueListSize >= lCabinCapacity);
 
     // Copy the EMSR sorted values to the BPV.
     EmsrValueList_T::iterator currentValue = lEmsrValueList.begin();

Modified: trunk/rmol/rmol.spec.in
===================================================================
--- trunk/rmol/rmol.spec.in	2009-02-15 11:33:58 UTC (rev 165)
+++ trunk/rmol/rmol.spec.in	2009-03-05 00:50:26 UTC (rev 166)
@@ -1,30 +1,21 @@
-Name: @PACKAGE@
-Summary: @PACKAGE_NAME@ is a C++ library of Revenue Management and Optimisation classes and functions. Typically, the service providers (like, e.g., airlines, hotels or car rental companies) may use that library to help them optimise their revenues from their seat capacities.
-Packager: Denis Arnaud <den...@us...>
-%define version @VERSION@
-%define release @RPM_RELEASE@
-Version: %{version}
-Release: %{release}
-License: LGPL
-Vendor: The RMOL Team
-Distribution: Research Software
-Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Group: System Environment/Libraries
-URL: http://%{name}.sourceforge.net/
-Requires: gsl-devel >= 1.8
-#Requires: gsl >= 1.8
+Name:           @PACKAGE@
+Version:        0.17.0
+Release:        0.dev.1
+Summary:        @PACKAGE_NAME@ is a C++ library of Revenue Management and Optimisation classes and functions. Typically, the service providers (like, e.g., airlines, hotels or car rental companies) may use that library to help them optimise their revenues from their seat capacities. 
 
-Prefix: %{_prefix}
+Group:          System Environment/Libraries 
+License:        LGPL
+URL:            http://%{name}.sourceforge.net
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-BuildRequires: gsl-devel >= 1.8
-BuildRequires: gettext, autoconf >= 2.58, automake >= 1.8
+BuildRequires:  gsl-devel >= 1.8
+BuildRequires:  boost-devel >= 1.34
+#Requires:       
 
-Prereq: /sbin/install-info
-
-%description 
-RMOL is a C++ library of Revenue Management and Optimisation classes and
-functions. Typically, that library may be used by service providers
+%description
+@PACKAGE_NAME@ is a C++ library of Revenue Management and Optimisation classes 
+and functions. Typically, that library may be used by service providers
 (e.g., airlines offering flight seats, hotels offering rooms, rental car
 companies offering rental days, broadcasting company offering advertisement 
 slots, theaters offering seats, etc.).
@@ -33,60 +24,46 @@
 The Theory and practice of Revenue Management, by Kalyan T. Talluri and
 Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7
 
-Install the rmol package if you need a library for high-level
+Install the @PACKAGE@ package if you need a library for high-level
 revenue management functionality.
 
-%package devel
-Summary: Static libraries and header files for RMOL development.
-Group: Development/Libraries
-Requires: %{name} = %{version}
+%package        devel
+Summary:        Headers and libraries for building apps that use @PACKAGE_NAME@
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
-%description devel
+%description    devel
+This package contains headers and libraries required to build applications that
+use @PACKAGE_NAME@.
 
-The rmol-devel package contains the header files and static libraries
-necessary for developing programs using the GSL (GNU Scientific
-Library).
-
 %package html-doc
 Summary: HTML documentation for the @PACKAGE_NAME@ library
 Group: System Environment/Libraries
 
 %description html-doc
-This package contains the documentation in the HTML format of the RMOL
-library. The documentation is the same as at the RMOL web page.
+This package contains the documentation in the HTML format of the @PACKAGE_NAME@
+library. The documentation is the same as at the @PACKAGE_NAME@ web page.
 
+
 %prep
 %setup -q
 
+
 %build
-%configure --enable-static --with-gsl-prefix=/nastools/gsl --with-docdir=%{_docdir}/%{name}-html-doc
-make
+%configure --enable-static --with-docdir=%{_docdir}/%{name}-%{version}-html-doc
+make %{?_smp_mflags}
 
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-%find_lang %{name}
 
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+#%find_lang %{name}
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
-rmolcsuffix=`echo "%{_libdir}" | sed s,/usr/,,`
-mv $RPM_BUILD_ROOT%{_bindir}/%{name}-config $RPM_BUILD_ROOT%{_bindir}/%{name}-config-$rmolcsuffix
-cat > $RPM_BUILD_ROOT%{_bindir}/%{name}-config << EOF
-#!/bin/sh
-if [ -e %{_bindir}/%{name}-config-lib64 ]; then
-  exec %{_bindir}/%{name}-config-lib64 "\$@"
-elif [ -e %{_bindir}/%{name}-config-* ]; then
-  rmolcfile="\`ls %{_bindir}/%{name}-config-* | head -n1\`"
-  exec \$rmolcfile "\$@" 
-fi
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -96,37 +73,35 @@
 
 %preun devel 
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}-ref.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.gz %{_infodir}/dir
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files
+#-f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
+%{_bindir}/*
+%{_libdir}/lib*.so.*
+#%{_docdir}/%{name}-%{version}/html
+#%{_datadir}/info/dir
+%{_datadir}/man/man3/%{name}.3.gz
 
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%{_libdir}/*so.*
-#%{_datadir}/locale/*/LC_*/*.mo
-
 %files devel
-%defattr(-,root,root)
-%doc AUTHORS COPYING
-%{_libdir}/*.la
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_bindir}/%{name}-config*
-%{_datadir}/aclocal/*
+%defattr(-,root,root,-)
+%doc
 %{_includedir}/%{name}
-%{_infodir}/*info*
-# The pkgconfig file cannot be installed. I don't understand why. Help needed!
-#%{_libdir}/pkgconfig/%{name}.pc
-# If you find a way to install the man pages from within rpmbuild, don't
-# hesitate!
-#%{_mandir}/man*/*
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/aclocal/%{name}.m4
+%{_datadir}/info/%{name}-ref.info.gz
+%{_datadir}/man/man1/%{name}-config.1.gz
 
 %files html-doc
-%doc %{_docdir}/%{name}-html-doc
+%doc %{_docdir}/%{name}-%{version}-html-doc
 
 %changelog
-* Sat Jan 27 2007  Denis Arnaud <den...@us...>
-- Initial spec file prepared
+ * Wed Mar  4 2009 Denis Arnaud <den...@m4...> %{version}.dev.1
+ - Second RPM release
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.