Compare commits

..

No commits in common. "rawhide" and "f18" have entirely different histories.
rawhide ... f18

7 changed files with 89 additions and 847 deletions

5
.gitignore vendored
View File

@ -1,4 +1 @@
/ocamlgraph-1.8.5.tar.gz
/ocamlgraph-1.8.6.tar.gz
/ocamlgraph-1.8.7.tar.gz
/ocamlgraph-1.8.8.tar.gz
/ocamlgraph-1.8.2.tar.gz

View File

@ -1,31 +1,45 @@
# Note: rpmlint complains that this package is not marked as
# noarch. This is not really an error as this is current standard
# practice for OCaml libraries even though they do not contain
# architecture dependent files themselves (the devel packages do
# instead).
#
# See https://www.redhat.com/archives/fedora-packaging/2008-August/msg00017.html
# for a discussion and
# https://www.redhat.com/archives/fedora-packaging/2008-August/msg00020.html
# for a potential fix. However, this is probably not the time and
# place to try to change the standard practice, so for now I will
# follow standard practice.
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%global ocaml_destdir %{_libdir}/ocaml
%global debug_package %{nil}
Name: ocaml-ocamlgraph
Version: 1.8.8
Release: 25%{?dist}
Version: 1.8.2
Release: 2%{?dist}
Summary: OCaml library for arc and node graphs
Group: Development/Libraries
License: LGPLv2 with exceptions
URL: http://ocamlgraph.lri.fr/index.en.html
URL: http://ocamlgraph.lri.fr/
Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
Source1: ocamlgraph-test.result
# When building the byte variant, do not try to install artifacts that were
# not built.
Patch0: ocamlgraph-1.8.6-byte-install.patch
# Fix the tests - unclear why this is necessary.
Patch1: ocamlgraph-1.8.7-fix-tests.patch
# Fix the install-findlib rule, and install some extras.
Patch0: ocamlgraph-1.8.1-install-extras.patch
BuildRequires: libart_lgpl-devel
BuildRequires: libgnomecanvas-devel
BuildRequires: make
BuildRequires: ocaml
BuildRequires: ocaml-findlib
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-ocamldoc
ExclusiveArch: %{ocaml_arches}
%global __requires_exclude ocaml\\\(Sig\\\)
%global libname %(sed -e 's/^ocaml-//' <<< %{name})
%description
Ocamlgraph provides several different implementations of graph data
@ -41,7 +55,8 @@ tools.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
@ -49,38 +64,21 @@ The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%package tools
Summary: Graph editing tools for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tools
The %{name}-tools package contains graph editing tools for use with
%{name}.
%prep
%setup -q -n %{libname}-%{version}
%ifnarch %{ocaml_native_compiler}
%setup -q -n ocamlgraph-%{version}
%patch0
%endif
%patch1 -p1
cp -p %{SOURCE1} .
# Fix encoding
for fil in CHANGES COPYING CREDITS; do
iconv -f latin1 -t utf-8 $fil > $fil.utf8
touch -r $fil $fil.utf8
mv -f $fil.utf8 $fil
done
# Remove spurious executable bits
find . -name '*.ml*' -perm /0111 | xargs chmod a-x
%build
%configure
%ifarch %{ocaml_native_compiler}
%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
%if %opt
%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
%else
%global opt_option OCAMLBEST=byte OCAMLC=ocamlc
%endif
@ -88,261 +86,49 @@ make depend
make %{opt_option}
make doc
# Skip the tests on i386; see https://github.com/ocaml/ocaml/issues/9800
%ifnarch %{ix86}
%ifarch %{ocaml_native_compiler}
%check
make --no-print-directory check >& test
diff -u test ocamlgraph-test.result
%endif
%endif
%install
mkdir -p %{buildroot}%{ocaml_destdir}
make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
%ifarch %{ocaml_native_compiler}
install -m 0755 -p graph.cmxs %{buildroot}%{ocaml_destdir}/%{libname}
%endif
# Include all code and examples in the docs
mkdir -p dox-devel/examples
mkdir -p dox-devel/API
cp -p examples/*.ml dox-devel/examples
cp -p doc/* dox-devel/API
# Install the graph editing tools
mkdir -p %{buildroot}%{_bindir}
%ifarch %{ocaml_native_compiler}
install -m 0755 -p editor/editor.opt %{buildroot}/%{_bindir}/ocaml-graph-editor
install -m 0755 -p dgraph/dgraph.opt %{buildroot}%{_bindir}/ocaml-graph-viewer
install -m 0755 -p view_graph/viewgraph.opt \
%{buildroot}%{_bindir}/ocaml-viewgraph
%else
install -m 0755 -p editor/editor.byte %{buildroot}/%{_bindir}/ocaml-graph-editor
install -m 0755 -p dgraph/dgraph.byte %{buildroot}%{_bindir}/ocaml-graph-viewer
install -m 0755 -p view_graph/viewgraph.byte \
%{buildroot}%{_bindir}/ocaml-viewgraph
%endif
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/
cp -p LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
cp -p README %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/
cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/
cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/
%files
%doc CREDITS FAQ
%license COPYING LICENSE
%{ocaml_destdir}/%{libname}/
%ifarch %{ocaml_native_compiler}
%{ocaml_destdir}/ocamlgraph/
%if %opt
%exclude %{ocaml_destdir}/*/*.a
%exclude %{ocaml_destdir}/*/*.cmxa
%exclude %{ocaml_destdir}/*/*.cmx
%exclude %{ocaml_destdir}/*/*.o
%endif
%exclude %{ocaml_destdir}/*/*.mli
%{_defaultdocdir}/%{name}-%{version}/LICENSE
%files devel
%doc CHANGES README.adoc dox-devel/*
%ifarch %{ocaml_native_compiler}
%if %opt
%{ocaml_destdir}/*/*.a
%{ocaml_destdir}/*/*.cmxa
%{ocaml_destdir}/*/*.cmx
%{ocaml_destdir}/*/*.o
%endif
%{ocaml_destdir}/*/*.mli
%files tools
%{_bindir}/*
# Include all code and examples in the doc directory
%{_defaultdocdir}/%{name}-%{version}-devel/
%changelog
* Mon Mar 1 16:57:43 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-25
- OCaml 4.12.0 build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-23
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-22
- OCaml 4.11.0 rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-21
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-19
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-18
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-17
- OCaml 4.11.0 pre-release
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-16
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-15
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-13
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-12
- OCaml 4.09.0 for riscv64
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-11
- OCaml 4.09.0 (final) rebuild.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-10
- OCaml 4.08.1 (final) rebuild.
* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-9
- Rebuild against new ocaml-lablgtk.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-8
- OCaml 4.08.1 (rc2) rebuild.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-4
- OCaml 4.07.0 (final) rebuild.
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-3
- OCaml 4.07.0-rc1 rebuild.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-1
- New upstream version 1.8.8.
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-11
- OCaml 4.06.0 rebuild.
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-10
- OCaml 4.05.0 rebuild.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-7
- OCaml 4.04.2 rebuild.
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-6
- Bump release and rebuild.
* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-5
- OCaml 4.04.1 rebuild.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.8.7-3
- rebuild for s390x codegen bug
* Sun Nov 06 2016 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-2
- Rebuild for OCaml 4.04.0.
* Sat Apr 16 2016 Jerry James <loganjerry@gmail.com> - 1.8.7-1
- New upstream release
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-5
- OCaml 4.02.3 rebuild.
* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-4
- Enable bytecode builds.
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-3
- ocaml-4.02.2 final rebuild.
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-2
- ocaml-4.02.2 rebuild.
* Wed Mar 18 2015 Jerry James <loganjerry@gmail.com> - 1.8.6-1
- New upstream release
- Reenable documentation generation
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-10
- ocaml-4.02.1 rebuild.
* Thu Oct 30 2014 Jerry James <loganjerry@gmail.com> - 1.8.5-9
- Rebuild for new ocaml-lablgtk
- Fix license handling
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-8
- ocaml-4.02.0 final rebuild.
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-7
- ocaml-4.02.0+rc1 rebuild.
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-5
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
* Wed Jul 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-4
- OCaml 4.02.0 beta rebuild.
- Disable documentation generation.
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Apr 21 2014 Jerry James <loganjerry@gmail.com> - 1.8.5-1
- New upstream release
* Tue Apr 15 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.4-2
- Remove ocaml_arches macro (RHBZ#1087794).
* Wed Feb 26 2014 Jerry James <loganjerry@gmail.com> - 1.8.4-1
- New upstream release, 1.8.4+dev, where the "+dev" refers to a bug fix
that was applied immediately after the 1.8.4 release
- Drop upstreamed patch
- Install graph.cmxs and enable the -debuginfo subpackage
- Update expected test results
- BR ocaml-findlib only, not ocaml-findlib-devel
- Install graph editing tools into -tools subpackage
- Fix the bytecode build
* Wed Oct 02 2013 Richard W.M. Jones <rjones@redhat.com> - 1.8.3-5
- Rebuild for ocaml-lablgtk 2.18.
* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.8.3-4
- Rebuild for OCaml 4.01.0.
* Tue Aug 6 2013 Jerry James <loganjerry@gmail.com> - 1.8.3-3
- Adapt to Rawhide unversioned docdir change (bz 994002)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue May 14 2013 Jerry James <loganjerry@gmail.com> - 1.8.3-1
- New upstream release
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Oct 17 2012 Jerry James <loganjerry@gmail.com> - 1.8.2-2
- Rebuild for OCaml 4.00.1.

View File

@ -0,0 +1,17 @@
--- Makefile.in.orig 2011-10-17 08:27:03.000000000 -0600
+++ Makefile.in 2011-10-25 11:25:33.708625231 -0600
@@ -349,8 +349,12 @@
$(OCAMLFIND) install ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(DGRAPH_CMXLIB) \
- $(DGRAPH_CMOLIB)
+ $(VIEWER_CMILIB) $(VIEWER_CMXLIB) \
+ $(VIEWER_CMXLIB:.cmx=.o) $(VIEWER_CMOLIB) \
+ $(DGRAPH_CMILIB) $(DGRAPH_CMXLIB) \
+ $(DGRAPH_CMXLIB:.cmx=.o) $(DGRAPH_CMOLIB) \
+ $(filter-out dgraph/dGraphTest.cmx, $(DGRAPH_CMX)) \
+ $(filter-out dgraph/dGraphTest.cmo, $(DGRAPH_CMO))
else
$(OCAMLFIND) install ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \

View File

@ -1,23 +0,0 @@
--- Makefile.in.orig 2015-01-23 00:24:01.000000000 -0700
+++ Makefile.in 2015-03-17 20:00:00.000000000 -0600
@@ -426,16 +426,13 @@
ifeq (@LABLGNOMECANVAS@,yes)
$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
- $(CMA) $(CMXA) \
- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
- $(VIEWER_CMXLIB:.cmx=.o) \
- $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
- $(DGRAPH_CMXLIB:.cmx=.o)
+ graph.cmo graph.cmi $(CMA) \
+ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
+ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
else
$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+ graph.cmo graph.cmi $(CMA)
endif
endif

View File

@ -1,10 +0,0 @@
--- ocamlgraph-1.8.7/tests/test_clique.ml~ 2016-04-12 07:47:33.000000000 +0100
+++ ocamlgraph-1.8.7/tests/test_clique.ml 2016-11-06 19:49:38.527278156 +0000
@@ -1,5 +1,7 @@
(* Test file for Brom-Kerbosch *)
+#directory ".";;
+
open Graph
module G = Persistent.Graph.Concrete (struct

View File

@ -1,550 +1,25 @@
mkdir -p bin
ocamlopt.opt -o bin/test-ts unix.cmxa graph.cmxa tests/test_topsort.ml
ocaml -I . graph.cma tests/test_clique.ml tests/check.ml
bin/test-ts 10
0 1 2
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=false
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=false y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
0 1 2
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=false y-->x=false
x=0 y=2 num(x)=1 num(y)=3
x-->y=false y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=false y-->x=false
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=false y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=false
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=false
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
0
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
0 1
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
0 1 2
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
0 2 1
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=0 y=2 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=1 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=1 y=1 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=1 y=2 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=2 y=1 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=2 y=2 num(x)=2 num(y)=2
x-->y=true y-->x=true
1 2 0
x=0 y=0 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=0 y=1 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=0 y=2 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=1 y=0 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=1 y=1 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=1 y=2 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=2 y=0 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=2 y=1 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=2 y=2 num(x)=2 num(y)=2
x-->y=true y-->x=true
1 2 3 4 0
x=0 y=0 num(x)=5 num(y)=5
x-->y=true y-->x=true
x=0 y=1 num(x)=5 num(y)=1
x-->y=false y-->x=true
x=0 y=2 num(x)=5 num(y)=2
x-->y=false y-->x=true
x=0 y=3 num(x)=5 num(y)=3
x-->y=false y-->x=false
x=0 y=4 num(x)=5 num(y)=4
x-->y=false y-->x=false
x=1 y=0 num(x)=1 num(y)=5
x-->y=true y-->x=false
x=1 y=1 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=1 y=2 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=1 y=3 num(x)=1 num(y)=3
x-->y=false y-->x=false
x=1 y=4 num(x)=1 num(y)=4
x-->y=false y-->x=false
x=2 y=0 num(x)=2 num(y)=5
x-->y=true y-->x=false
x=2 y=1 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=2 y=2 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=2 y=3 num(x)=2 num(y)=3
x-->y=false y-->x=false
x=2 y=4 num(x)=2 num(y)=4
x-->y=false y-->x=false
x=3 y=0 num(x)=3 num(y)=5
x-->y=false y-->x=false
x=3 y=1 num(x)=3 num(y)=1
x-->y=false y-->x=false
x=3 y=2 num(x)=3 num(y)=2
x-->y=false y-->x=false
x=3 y=3 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=3 y=4 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=4 y=0 num(x)=4 num(y)=5
x-->y=false y-->x=false
x=4 y=1 num(x)=4 num(y)=1
x-->y=false y-->x=false
x=4 y=2 num(x)=4 num(y)=2
x-->y=false y-->x=false
x=4 y=3 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=4 y=4 num(x)=4 num(y)=4
x-->y=true y-->x=true
0 1 2
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=false
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=false y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=true
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=true y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
0 1 2
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=false
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=false y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=true
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=true y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
2 3 0 1
x=0 y=0 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=0 y=1 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=0 y=2 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=0 y=3 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=1 y=0 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=1 y=1 num(x)=4 num(y)=4
x-->y=true y-->x=true
x=1 y=2 num(x)=4 num(y)=1
x-->y=false y-->x=true
x=1 y=3 num(x)=4 num(y)=2
x-->y=false y-->x=true
x=2 y=0 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=2 y=1 num(x)=1 num(y)=4
x-->y=true y-->x=false
x=2 y=2 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=2 y=3 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=3 y=0 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=3 y=1 num(x)=2 num(y)=4
x-->y=true y-->x=false
x=3 y=2 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=3 y=3 num(x)=2 num(y)=2
x-->y=true y-->x=true
0 1 2 3
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=0 y=3 num(x)=1 num(y)=4
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=1 y=3 num(x)=2 num(y)=4
x-->y=true y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=2 y=3 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=3 y=0 num(x)=4 num(y)=1
x-->y=false y-->x=true
x=3 y=1 num(x)=4 num(y)=2
x-->y=false y-->x=true
x=3 y=2 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=3 y=3 num(x)=4 num(y)=4
x-->y=true y-->x=true
0 1 2 3
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=true
x=0 y=3 num(x)=1 num(y)=4
x-->y=true y-->x=true
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=true
x=1 y=3 num(x)=2 num(y)=4
x-->y=true y-->x=true
x=2 y=0 num(x)=3 num(y)=1
x-->y=true y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=true y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=2 y=3 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=3 y=0 num(x)=4 num(y)=1
x-->y=true y-->x=true
x=3 y=1 num(x)=4 num(y)=2
x-->y=true y-->x=true
x=3 y=2 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=3 y=3 num(x)=4 num(y)=4
x-->y=true y-->x=true
3 0 1 2 4
x=0 y=0 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=0 y=1 num(x)=2 num(y)=3
x-->y=true y-->x=true
x=0 y=2 num(x)=2 num(y)=4
x-->y=true y-->x=true
x=0 y=3 num(x)=2 num(y)=1
x-->y=false y-->x=true
x=0 y=4 num(x)=2 num(y)=5
x-->y=true y-->x=false
x=1 y=0 num(x)=3 num(y)=2
x-->y=true y-->x=true
x=1 y=1 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=1 y=2 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=1 y=3 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=1 y=4 num(x)=3 num(y)=5
x-->y=true y-->x=false
x=2 y=0 num(x)=4 num(y)=2
x-->y=true y-->x=true
x=2 y=1 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=2 y=2 num(x)=4 num(y)=4
x-->y=true y-->x=true
x=2 y=3 num(x)=4 num(y)=1
x-->y=false y-->x=true
x=2 y=4 num(x)=4 num(y)=5
x-->y=true y-->x=false
x=3 y=0 num(x)=1 num(y)=2
x-->y=true y-->x=false
x=3 y=1 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=3 y=2 num(x)=1 num(y)=4
x-->y=true y-->x=false
x=3 y=3 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=3 y=4 num(x)=1 num(y)=5
x-->y=true y-->x=false
x=4 y=0 num(x)=5 num(y)=2
x-->y=false y-->x=true
x=4 y=1 num(x)=5 num(y)=3
x-->y=false y-->x=true
x=4 y=2 num(x)=5 num(y)=4
x-->y=false y-->x=true
x=4 y=3 num(x)=5 num(y)=1
x-->y=false y-->x=true
x=4 y=4 num(x)=5 num(y)=5
x-->y=true y-->x=true
0 1 2 3 4 5 6
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=0 y=3 num(x)=1 num(y)=4
x-->y=true y-->x=false
x=0 y=4 num(x)=1 num(y)=5
x-->y=true y-->x=false
x=0 y=5 num(x)=1 num(y)=6
x-->y=true y-->x=false
x=0 y=6 num(x)=1 num(y)=7
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=1 y=3 num(x)=2 num(y)=4
x-->y=true y-->x=false
x=1 y=4 num(x)=2 num(y)=5
x-->y=true y-->x=false
x=1 y=5 num(x)=2 num(y)=6
x-->y=true y-->x=false
x=1 y=6 num(x)=2 num(y)=7
x-->y=true y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=2 y=3 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=2 y=4 num(x)=3 num(y)=5
x-->y=true y-->x=false
x=2 y=5 num(x)=3 num(y)=6
x-->y=true y-->x=false
x=2 y=6 num(x)=3 num(y)=7
x-->y=true y-->x=false
x=3 y=0 num(x)=4 num(y)=1
x-->y=false y-->x=true
x=3 y=1 num(x)=4 num(y)=2
x-->y=false y-->x=true
x=3 y=2 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=3 y=3 num(x)=4 num(y)=4
x-->y=true y-->x=true
x=3 y=4 num(x)=4 num(y)=5
x-->y=true y-->x=false
x=3 y=5 num(x)=4 num(y)=6
x-->y=true y-->x=false
x=3 y=6 num(x)=4 num(y)=7
x-->y=true y-->x=false
x=4 y=0 num(x)=5 num(y)=1
x-->y=false y-->x=true
x=4 y=1 num(x)=5 num(y)=2
x-->y=false y-->x=true
x=4 y=2 num(x)=5 num(y)=3
x-->y=false y-->x=true
x=4 y=3 num(x)=5 num(y)=4
x-->y=false y-->x=true
x=4 y=4 num(x)=5 num(y)=5
x-->y=true y-->x=true
x=4 y=5 num(x)=5 num(y)=6
x-->y=true y-->x=true
x=4 y=6 num(x)=5 num(y)=7
x-->y=true y-->x=true
x=5 y=0 num(x)=6 num(y)=1
x-->y=false y-->x=true
x=5 y=1 num(x)=6 num(y)=2
x-->y=false y-->x=true
x=5 y=2 num(x)=6 num(y)=3
x-->y=false y-->x=true
x=5 y=3 num(x)=6 num(y)=4
x-->y=false y-->x=true
x=5 y=4 num(x)=6 num(y)=5
x-->y=true y-->x=true
x=5 y=5 num(x)=6 num(y)=6
x-->y=true y-->x=true
x=5 y=6 num(x)=6 num(y)=7
x-->y=true y-->x=true
x=6 y=0 num(x)=7 num(y)=1
x-->y=false y-->x=true
x=6 y=1 num(x)=7 num(y)=2
x-->y=false y-->x=true
x=6 y=2 num(x)=7 num(y)=3
x-->y=false y-->x=true
x=6 y=3 num(x)=7 num(y)=4
x-->y=false y-->x=true
x=6 y=4 num(x)=7 num(y)=5
x-->y=true y-->x=true
x=6 y=5 num(x)=7 num(y)=6
x-->y=true y-->x=true
x=6 y=6 num(x)=7 num(y)=7
x-->y=true y-->x=true
0 1 2 3 4 5 6
x=0 y=0 num(x)=1 num(y)=1
x-->y=true y-->x=true
x=0 y=1 num(x)=1 num(y)=2
x-->y=true y-->x=true
x=0 y=2 num(x)=1 num(y)=3
x-->y=true y-->x=false
x=0 y=3 num(x)=1 num(y)=4
x-->y=true y-->x=false
x=0 y=4 num(x)=1 num(y)=5
x-->y=true y-->x=false
x=0 y=5 num(x)=1 num(y)=6
x-->y=true y-->x=false
x=0 y=6 num(x)=1 num(y)=7
x-->y=true y-->x=false
x=1 y=0 num(x)=2 num(y)=1
x-->y=true y-->x=true
x=1 y=1 num(x)=2 num(y)=2
x-->y=true y-->x=true
x=1 y=2 num(x)=2 num(y)=3
x-->y=true y-->x=false
x=1 y=3 num(x)=2 num(y)=4
x-->y=true y-->x=false
x=1 y=4 num(x)=2 num(y)=5
x-->y=true y-->x=false
x=1 y=5 num(x)=2 num(y)=6
x-->y=true y-->x=false
x=1 y=6 num(x)=2 num(y)=7
x-->y=true y-->x=false
x=2 y=0 num(x)=3 num(y)=1
x-->y=false y-->x=true
x=2 y=1 num(x)=3 num(y)=2
x-->y=false y-->x=true
x=2 y=2 num(x)=3 num(y)=3
x-->y=true y-->x=true
x=2 y=3 num(x)=3 num(y)=4
x-->y=true y-->x=true
x=2 y=4 num(x)=3 num(y)=5
x-->y=true y-->x=true
x=2 y=5 num(x)=3 num(y)=6
x-->y=true y-->x=true
x=2 y=6 num(x)=3 num(y)=7
x-->y=true y-->x=true
x=3 y=0 num(x)=4 num(y)=1
x-->y=false y-->x=true
x=3 y=1 num(x)=4 num(y)=2
x-->y=false y-->x=true
x=3 y=2 num(x)=4 num(y)=3
x-->y=true y-->x=true
x=3 y=3 num(x)=4 num(y)=4
x-->y=true y-->x=true
x=3 y=4 num(x)=4 num(y)=5
x-->y=true y-->x=true
x=3 y=5 num(x)=4 num(y)=6
x-->y=true y-->x=true
x=3 y=6 num(x)=4 num(y)=7
x-->y=true y-->x=true
x=4 y=0 num(x)=5 num(y)=1
x-->y=false y-->x=true
x=4 y=1 num(x)=5 num(y)=2
x-->y=false y-->x=true
x=4 y=2 num(x)=5 num(y)=3
x-->y=true y-->x=true
x=4 y=3 num(x)=5 num(y)=4
x-->y=true y-->x=true
x=4 y=4 num(x)=5 num(y)=5
x-->y=true y-->x=true
x=4 y=5 num(x)=5 num(y)=6
x-->y=true y-->x=true
x=4 y=6 num(x)=5 num(y)=7
x-->y=true y-->x=true
x=5 y=0 num(x)=6 num(y)=1
x-->y=false y-->x=true
x=5 y=1 num(x)=6 num(y)=2
x-->y=false y-->x=true
x=5 y=2 num(x)=6 num(y)=3
x-->y=true y-->x=true
x=5 y=3 num(x)=6 num(y)=4
x-->y=true y-->x=true
x=5 y=4 num(x)=6 num(y)=5
x-->y=true y-->x=true
x=5 y=5 num(x)=6 num(y)=6
x-->y=true y-->x=true
x=5 y=6 num(x)=6 num(y)=7
x-->y=true y-->x=true
x=6 y=0 num(x)=7 num(y)=1
x-->y=false y-->x=true
x=6 y=1 num(x)=7 num(y)=2
x-->y=false y-->x=true
x=6 y=2 num(x)=7 num(y)=3
x-->y=true y-->x=true
x=6 y=3 num(x)=7 num(y)=4
x-->y=true y-->x=true
x=6 y=4 num(x)=7 num(y)=5
x-->y=true y-->x=true
x=6 y=5 num(x)=7 num(y)=6
x-->y=true y-->x=true
x=6 y=6 num(x)=7 num(y)=7
x-->y=true y-->x=true
All tests succeeded.
ocaml graph.cma tests/check.ml
iter:
pre 3
pre 5
pre 4
pre 2
post 2
post 4
post 5
pre 6
post 6
post 3
prefix:
pre 3
pre 6
pre 5
pre 4
pre 2
step:
visit 6
visit 5
visit 4
visit 2
visit 3
visit 1

View File

@ -1 +1 @@
SHA512 (ocamlgraph-1.8.8.tar.gz) = ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
efa4394bc4651c90de443ff61c7477e6 ocamlgraph-1.8.2.tar.gz