Compare commits
90 Commits
Author | SHA1 | Date |
---|---|---|
Richard W.M. Jones | 1c397e65ac | |
Fedora Release Engineering | efe11413c4 | |
Jerry James | eae6842713 | |
Richard W.M. Jones | 087ca378a5 | |
Richard W.M. Jones | e67ce1277a | |
Jerry James | 89f7da510a | |
Fedora Release Engineering | b3d9984585 | |
Fedora Release Engineering | 5764bbeff2 | |
Richard W.M. Jones | 462e3fc831 | |
Richard W.M. Jones | 06f19bdccc | |
Richard W.M. Jones | 475059402f | |
Richard W.M. Jones | 88433e4e9a | |
Richard W.M. Jones | c2a6ef1449 | |
Fedora Release Engineering | 6eb2f20252 | |
Richard W.M. Jones | 27c9570599 | |
Richard W.M. Jones | 801f05e1df | |
Richard W.M. Jones | a3aa873332 | |
Richard W.M. Jones | a00a210f7c | |
Richard W.M. Jones | 13518c8052 | |
Richard W.M. Jones | e0204097a2 | |
Fedora Release Engineering | fd4e02df3c | |
Fedora Release Engineering | f68c523888 | |
Fedora Release Engineering | b23aecaee1 | |
Richard W.M. Jones | 5ad3f0bd75 | |
Richard W.M. Jones | b784d3e69b | |
Fedora Release Engineering | 390232d1c2 | |
Richard W.M. Jones | c667791fb7 | |
Richard W.M. Jones | b66866e56d | |
Richard W.M. Jones | 57363b969e | |
Richard W.M. Jones | 832e0e6d1a | |
Richard W.M. Jones | 69afba0195 | |
Richard W.M. Jones | 4b65f79d61 | |
Fedora Release Engineering | 92753a8606 | |
Fedora Release Engineering | 35cd69091d | |
Richard W.M. Jones | 0920c5adfe | |
Richard W.M. Jones | fd95484c12 | |
Richard W.M. Jones | 1ac26ce3f5 | |
Fedora Release Engineering | 68c80c00ee | |
Dan Horák | 39128591bc | |
Richard W.M. Jones | 4251ad60d8 | |
Richard W.M. Jones | f609630572 | |
Jerry James | 8345187200 | |
Fedora Release Engineering | a77d13b46a | |
Richard W.M. Jones | 64f250e757 | |
Richard W.M. Jones | 1c8d9d1ff3 | |
Richard W.M. Jones | 74ce89687e | |
Richard W.M. Jones | 61ccec1e37 | |
Jerry James | 57eba89f14 | |
Richard W.M. Jones | 09e67b9253 | |
Jerry James | c1523bbec5 | |
Richard W.M. Jones | 06cef26c0b | |
Richard W.M. Jones | 8e06551b3c | |
Peter Robinson | f8ce2e9f2f | |
Richard W.M. Jones | d5f823d76f | |
Richard W.M. Jones | 36fa87419f | |
Richard W.M. Jones | 1cea254ddd | |
Dennis Gilmore | 0f96391965 | |
Jerry James | 52bf5b57dd | |
Richard W.M. Jones | efb30521f9 | |
Jerry James | 9f346d1442 | |
Richard W.M. Jones | 6e4162533d | |
Richard W.M. Jones | d098408faf | |
Jerry James | b5dddefdc2 | |
Dennis Gilmore | d6f096b0c9 | |
Jerry James | 5ccbe52e8b | |
Dennis Gilmore | c38d1516ed | |
Jerry James | b8ac872f7e | |
Jerry James | 8afa35f243 | |
Dennis Gilmore | da04023d61 | |
Richard W.M. Jones | 135f4ed531 | |
Jerry James | b6ab39c6c7 | |
Jerry James | c1691efb93 | |
Jerry James | 256528d223 | |
Dennis Gilmore | 6dc8edb851 | |
Richard W.M. Jones | c4d5392b03 | |
Richard W.M. Jones | 1fbf4fd712 | |
Fedora Release Engineering | 1e15d9bd69 | |
Alan Dunn | 1cfe3a34ba | |
Richard W.M. Jones | 2939b0a1a2 | |
Bill Nottingham | 6c2033f7be | |
Richard W.M. Jones | 3b940d1029 | |
Alan Dunn | a3b8edba14 | |
Jesse Keating | 946f783a13 | |
Richard W.M. Jones | 384fc3324b | |
Karsten Hopp | fae9be5666 | |
Jesse Keating | 4891f78a6a | |
Richard W.M. Jones | 115c2557a2 | |
Richard W.M. Jones | 488cf1b95c | |
Richard W.M. Jones | dbc8fc5a04 | |
Alan Dunn | 9b861aadd6 |
|
@ -0,0 +1,4 @@
|
||||||
|
/ocamlgraph-1.8.5.tar.gz
|
||||||
|
/ocamlgraph-1.8.6.tar.gz
|
||||||
|
/ocamlgraph-1.8.7.tar.gz
|
||||||
|
/ocamlgraph-1.8.8.tar.gz
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
||||||
# Makefile for source rpm: ocaml-ocamlgraph
|
|
||||||
# $Id$
|
|
||||||
NAME := ocaml-ocamlgraph
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
|
@ -0,0 +1,431 @@
|
||||||
|
%global ocaml_destdir %{_libdir}/ocaml
|
||||||
|
|
||||||
|
Name: ocaml-ocamlgraph
|
||||||
|
Version: 1.8.8
|
||||||
|
Release: 25%{?dist}
|
||||||
|
Summary: OCaml library for arc and node graphs
|
||||||
|
|
||||||
|
License: LGPLv2 with exceptions
|
||||||
|
URL: http://ocamlgraph.lri.fr/index.en.html
|
||||||
|
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
|
||||||
|
|
||||||
|
BuildRequires: libart_lgpl-devel
|
||||||
|
BuildRequires: libgnomecanvas-devel
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: ocaml
|
||||||
|
BuildRequires: ocaml-findlib
|
||||||
|
BuildRequires: ocaml-lablgtk-devel
|
||||||
|
BuildRequires: ocaml-ocamldoc
|
||||||
|
|
||||||
|
%global __requires_exclude ocaml\\\(Sig\\\)
|
||||||
|
%global libname %(sed -e 's/^ocaml-//' <<< %{name})
|
||||||
|
|
||||||
|
%description
|
||||||
|
Ocamlgraph provides several different implementations of graph data
|
||||||
|
structures. It also provides implementations for a number of classical
|
||||||
|
graph algorithms like Kruskal's algorithm for MSTs, topological
|
||||||
|
ordering of DAGs, Dijkstra's shortest paths algorithm, and
|
||||||
|
Ford-Fulkerson's maximal-flow algorithm to name a few. The algorithms
|
||||||
|
and data structures are written functorially for maximal
|
||||||
|
reusability. Also has input and output capability for Graph Modeling
|
||||||
|
Language file format and Dot and Neato graphviz (graph visualization)
|
||||||
|
tools.
|
||||||
|
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development files for %{name}
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
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}
|
||||||
|
%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
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure
|
||||||
|
|
||||||
|
%ifarch %{ocaml_native_compiler}
|
||||||
|
%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
|
||||||
|
%else
|
||||||
|
%global opt_option OCAMLBEST=byte OCAMLC=ocamlc
|
||||||
|
%endif
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc CREDITS FAQ
|
||||||
|
%license COPYING LICENSE
|
||||||
|
%{ocaml_destdir}/%{libname}/
|
||||||
|
%ifarch %{ocaml_native_compiler}
|
||||||
|
%exclude %{ocaml_destdir}/*/*.a
|
||||||
|
%exclude %{ocaml_destdir}/*/*.cmxa
|
||||||
|
%exclude %{ocaml_destdir}/*/*.cmx
|
||||||
|
%exclude %{ocaml_destdir}/*/*.o
|
||||||
|
%endif
|
||||||
|
%exclude %{ocaml_destdir}/*/*.mli
|
||||||
|
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%doc CHANGES README.adoc dox-devel/*
|
||||||
|
%ifarch %{ocaml_native_compiler}
|
||||||
|
%{ocaml_destdir}/*/*.a
|
||||||
|
%{ocaml_destdir}/*/*.cmxa
|
||||||
|
%{ocaml_destdir}/*/*.cmx
|
||||||
|
%{ocaml_destdir}/*/*.o
|
||||||
|
%endif
|
||||||
|
%{ocaml_destdir}/*/*.mli
|
||||||
|
|
||||||
|
|
||||||
|
%files tools
|
||||||
|
%{_bindir}/*
|
||||||
|
|
||||||
|
|
||||||
|
%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.
|
||||||
|
|
||||||
|
* Mon Jul 30 2012 Jerry James <loganjerry@gmail.com> - 1.8.2-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 11 2012 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-3
|
||||||
|
- Rebuild for OCaml 4.00.0.
|
||||||
|
|
||||||
|
* Sat Jan 7 2012 Jerry James <loganjerry@gmail.com> - 1.8.1-2
|
||||||
|
- Rebuild for OCaml 3.12.1
|
||||||
|
|
||||||
|
* Tue Oct 25 2011 Jerry James <loganjerry@gmail.com> - 1.8.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Jul 11 2011 Jerry James <loganjerry@gmail.com> - 1.7-1
|
||||||
|
- New upstream release
|
||||||
|
- Drop unnecessary spec file elements (BuildRoot, etc.)
|
||||||
|
- Drop dependency generation workaround for Fedora 12 and earlier
|
||||||
|
- Remove spurious executable bits on source files
|
||||||
|
- Replace the definition of __ocaml_requires_opts to "-i Sig", which removes
|
||||||
|
the legitimate Requires: ocaml(GtkSignal), with __requires_exclude.
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1.6-2
|
||||||
|
- Ignore ocaml(Sig) symbol.
|
||||||
|
|
||||||
|
* Mon Jan 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
|
||||||
|
- New upstream version 1.6.
|
||||||
|
- Rebuild for OCaml 3.12.
|
||||||
|
- Remove obsolete patches and add patch to fix install-findlib rule.
|
||||||
|
|
||||||
|
* Wed Feb 10 2010 Alan Dunn <amdunn@gmail.com> - 1.3-3
|
||||||
|
- Include files (including .cmo files) and install more files that are
|
||||||
|
needed by other applications (eg: Frama-C) that depend on
|
||||||
|
ocaml-ocamlgraph
|
||||||
|
- define -> global
|
||||||
|
- Update for new dependency generator in F13
|
||||||
|
|
||||||
|
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.3-2
|
||||||
|
- Rebuild for OCaml 3.11.2.
|
||||||
|
|
||||||
|
* Thu Oct 8 2009 Richard W.M. Jones <rjones@redhat.com> - 1.3-1
|
||||||
|
- New upstream release 1.3.
|
||||||
|
- A slightly different viewGraph-related patch is required for this release.
|
||||||
|
|
||||||
|
* Fri Aug 07 2009 Alan Dunn <amdunn@gmail.com> - 1.1-1
|
||||||
|
- New upstream release 1.1.
|
||||||
|
- Makefile patch updated (still not incorporated upstream).
|
||||||
|
|
||||||
|
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat May 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0-5
|
||||||
|
- Rebuild for OCaml 3.11.1
|
||||||
|
|
||||||
|
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
|
||||||
|
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
|
||||||
|
(added sparc64 per request from the sparc maintainer)
|
||||||
|
|
||||||
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0-3
|
||||||
|
- Rebuild for OCaml 3.11.0.
|
||||||
|
- Requires lablgtk2.
|
||||||
|
- Pull in gtk / libgnomecanvas too.
|
||||||
|
|
||||||
|
* Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0-1
|
||||||
|
- New upstream release 1.0.
|
||||||
|
- Patch0 removed - now upstream.
|
||||||
|
- Added a patch to fix documentation problem.
|
||||||
|
- Run tests with 'make --no-print-directory'.
|
||||||
|
|
||||||
|
* Wed Aug 13 2008 Alan Dunn <amdunn@gmail.com> 0.99c-2
|
||||||
|
- Incorporates changes suggested during review:
|
||||||
|
- License information was incorrect
|
||||||
|
- rpmlint error now properly justified
|
||||||
|
|
||||||
|
* Thu Aug 07 2008 Alan Dunn <amdunn@gmail.com> 0.99c-1
|
||||||
|
- Initial Fedora RPM release.
|
|
@ -0,0 +1,23 @@
|
||||||
|
--- 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
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- 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
|
|
@ -0,0 +1,550 @@
|
||||||
|
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.
|
||||||
|
|
Loading…
Reference in New Issue