[PPL-devel] [GIT] ppl/ppl(master): Reverted bogus commits.
Abramo Bagnara
abramo.bagnara at gmail.com
Mon Mar 30 13:21:30 CEST 2009
Module: ppl/ppl
Branch: master
Commit: 7bcea883ad54f3411ee17ec64783f7df90f26004
URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7bcea883ad54f3411ee17ec64783f7df90f26004
Author: Abramo Bagnara <abramo.bagnara at gmail.com>
Date: Mon Mar 30 13:21:27 2009 +0200
Reverted bogus commits.
---
interfaces/Java/jni/ppl_java_globals.cc | 21 ---------
interfaces/Java/parma_polyhedra_library/IO.java | 47 --------------------
.../Java/parma_polyhedra_library/Makefile.am | 4 --
interfaces/Java/tests/MIP_Problem_test1.java | 2 +-
4 files changed, 1 insertions(+), 73 deletions(-)
diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc
index 97e2071..d35275d 100644
--- a/interfaces/Java/jni/ppl_java_globals.cc
+++ b/interfaces/Java/jni/ppl_java_globals.cc
@@ -32,7 +32,6 @@ site: http://www.cs.unipr.it/ppl/ . */
#include "parma_polyhedra_library_Generator_System.h"
#include "parma_polyhedra_library_Grid_Generator.h"
#include "parma_polyhedra_library_Grid_Generator_System.h"
-#include "parma_polyhedra_library_IO.h"
using namespace Parma_Polyhedra_Library;
using namespace Parma_Polyhedra_Library::Interfaces::Java;
@@ -715,23 +714,3 @@ Java_parma_1polyhedra_1library_Congruence_1System_ascii_1dump
CATCH_ALL;
return 0;
}
-
-JNIEXPORT jstring JNICALL
-Java_parma_1polyhedra_1library_IO_wrap_1string
-(JNIEnv* env, jstring str, jint indent_depth,
- jint preferred_first_line_length, jint preferred_line_length) {
- try {
- unsigned ind = jtype_to_unsigned<unsigned int>(indent_depth);
- unsigned pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length);
- unsigned pll = jtype_to_unsigned<unsigned int>(preferred_line_length);
- const char* chars = env->GetStringUTFChars(str, 0);
- if (!chars)
- return 0;
- using namespace Parma_Polyhedra_Library::IO_Operators;
- std::string s = wrap_string(chars, ind, pfll, pll);
- env->ReleaseStringUTFChars(str, chars);
- return env->NewStringUTF(s.c_str());
- }
- CATCH_ALL;
- return 0;
-}
diff --git a/interfaces/Java/parma_polyhedra_library/IO.java b/interfaces/Java/parma_polyhedra_library/IO.java
deleted file mode 100644
index 1b83922..0000000
--- a/interfaces/Java/parma_polyhedra_library/IO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* IO Java class declaration and implementation.
- Copyright (C) 2001-2009 Roberto Bagnara <bagnara at cs.unipr.it>
-
-This file is part of the Parma Polyhedra Library (PPL).
-
-The PPL is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-The PPL is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-
-For the most up-to-date information see the Parma Polyhedra Library
-site: http://www.cs.unipr.it/ppl/ . */
-
-package parma_polyhedra_library;
-
-//! A class collecting I/O functions.
-/*! \ingroup PPL_Java_interface */
-public class IO {
- //! Utility function for the wrapping of lines of text.
- /*!
- \param str
- The source string holding the lines to wrap.
-
- \param indent_depth
- The indentation depth.
-
- \param preferred_first_line_length
- The preferred length for the first line of text.
-
- \param preferred_line_length
- The preferred length for all the lines but the first one.
-
- \return
- The wrapped string.
- */
- public static native String wrap_string(String str, int indent_depth,
- int preferred_first_line_length, int preferred_line_length);
-}
diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am
index 9505cb7..b3542ec 100644
--- a/interfaces/Java/parma_polyhedra_library/Makefile.am
+++ b/interfaces/Java/parma_polyhedra_library/Makefile.am
@@ -41,7 +41,6 @@ parma_polyhedra_library.Generator \
parma_polyhedra_library.Generator_System \
parma_polyhedra_library.Grid_Generator \
parma_polyhedra_library.Grid_Generator_System \
-parma_polyhedra_library.IO \
parma_polyhedra_library.Linear_Expression \
parma_polyhedra_library.MIP_Problem \
parma_polyhedra_library.Parma_Polyhedra_Library
@@ -55,7 +54,6 @@ parma_polyhedra_library_Generator.h \
parma_polyhedra_library_Generator_System.h \
parma_polyhedra_library_Grid_Generator.h \
parma_polyhedra_library_Grid_Generator_System.h \
-parma_polyhedra_library_IO.h \
parma_polyhedra_library_Linear_Expression.h \
parma_polyhedra_library_MIP_Problem.h \
parma_polyhedra_library_Parma_Polyhedra_Library.h
@@ -80,7 +78,6 @@ $(srcdir)/Grid_Generator.java \
$(srcdir)/Grid_Generator_System.java \
$(srcdir)/Grid_Generator_Type.java \
$(srcdir)/Invalid_Argument_Exception.java \
-$(srcdir)/IO.java \
$(srcdir)/Length_Error_Exception.java \
$(srcdir)/Linear_Expression.java \
$(srcdir)/Linear_Expression_Coefficient.java \
@@ -179,7 +176,6 @@ Grid_Generator.class \
Grid_Generator_System.class \
Grid_Generator_Type.class \
Invalid_Argument_Exception.class \
-IO.class \
Length_Error_Exception.class \
Linear_Expression.class \
Linear_Expression_Coefficient.class \
diff --git a/interfaces/Java/tests/MIP_Problem_test1.java b/interfaces/Java/tests/MIP_Problem_test1.java
index ff5b9f8..f6b9515 100644
--- a/interfaces/Java/tests/MIP_Problem_test1.java
+++ b/interfaces/Java/tests/MIP_Problem_test1.java
@@ -234,7 +234,7 @@ static {
ok = (ov_ph.equals(expected_ov_ph));
PPL_Test.println_if_noisy("Testing toString(): ");
- PPL_Test.println_if_noisy(IO.wrap_string(mip1.toString(), 4, 64, 60));
+ PPL_Test.println_if_noisy(mip1.toString());
PPL_Test.println_if_noisy();
PPL_Test.print_if_noisy("Testing max_space_dimension(): ");
More information about the PPL-devel
mailing list