Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bubblesort #2

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open

Bubblesort #2

wants to merge 46 commits into from

Conversation

raoulb
Copy link

@raoulb raoulb commented Oct 26, 2012

This PR contains:

  • Generic implementation of merge sort algorithm
  • Versions of bubble, insertion and merge sort algorithm that count the number of elementary transpositions done during sorting.

hebisch and others added 30 commits May 2, 2014 21:39
@hebisch
Nicer error messages.
e62bb92 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1748 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Misc cleanups.
daa2cbf 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1749 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
De-hunkify a few files.
6c5c63b 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1750 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix printing of '%i' in types.
ee776df 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1751 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix problem with missing parentheses around plexes.
40aa963 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1752 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix wrong unevaluated algebraic integrals.
58deb95 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1753 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix interpreter coercion from Equation to Boolean.
e1f33c7 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1754 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Disable incorrect optimization.
a6651d3 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1755 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix intepreter assingment to aggregates.
274b141 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1756 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Remove broken 'stringMatch'.
9ee12df 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1757 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Allow 0^0 in CardinalNumber.
c42b0c3 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1758 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Improve 0 to complex power.
5b5554c 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1759 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Unwrap exposed.lsp.pamphlet.
402a16e 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1760 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
De-hunkify last few pamphlets.
baaabd3 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1761 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix few problems with interpreter closures.
95f93df 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1762 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Do not use notangle during build.
456dbcc 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1763 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Drop .pamphlet extension.
1eb4368 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1764 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix in source 'make clean'.
45b56ca 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1765 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
properly escape in TeXFormat
6d821b4 
See message "unescaped underscore" on fricas-devel (15-Apr-2014).
https://groups.google.com/d/msg/fricas-devel/lCgu8gvVOIM/T2-HyrnpsXcJ

Underscores should be escaped by a backslash like this: \_.
These are the problems that are resolved by this patch.

(5) -> )set output algebra off
(5) -> )set output tex on
(5) -> escape()

$$
_
\leqno(5)
$$

(6) -> 1.2345678901234567890123

$$
1.2345678901_23456789
\leqno(6)
$$

(1) -> "a_b_"\"

   (1)  "a_b"\"
$$
\mbox{\tt "a_b"\"}
\leqno(1)
$$

After the patch.

(1) -> )set output algebra off
(1) -> )set output tex on
(1) -> escape()

$$
\_
\leqno(1)
$$

(2) -> 1.2345678901234567890123

$$
1.2345678901\_23456789
\leqno(2)
$$

(3) -> "a_b_"\"

$$
\verb#"a_b"\"#
\leqno(3)
$$

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1766 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
add ioHooks for syscmd and error function
b79a90b 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1767 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
\axiom* \spad*
3dfbe7d 
for f in $(find . -type f|grep -v '\.git'|grep -v '\.sh$'|grep -v '\.awk'); do
    sed -i \
        -e 's/\\axiomType{/\\spadtype{/g' \
        -e 's/\\axiomOp{/\\spadop{/g' \
        -e 's/\\axiomOpFrom{/\\spadopFrom{/g' \
        -e 's/\\axiomFun{/\\spadfun{/g' \
        -e 's/\\axiomFunFrom{/\\spadfunFrom{/g' \
        -e 's/\\axiomFunX{/\\spadfunX{/g' \
        -e 's/\\axiomFunFromX{/\\spadfunFromX{/g' \
        -e 's/\\axiomSyntax{/\\spadSyntax{/g' \
        -e 's/\\axiomSig{/\\spadsig{/g' \
        -e 's/\\axiom{/\\spad{/g' \
        -e 's/\\axiomGloss{/\\spadgloss{/g' \
        -e 's/\\axiomGlossSee{/\\spadglossSee{/g' \
        -e 's/\\axiomcommand{/\\spadcommand{/g' \
        -e 's/\\axiomgraph{/\\spadgraph{/g' \
        -e 's/\\\\axiomType\\{/\\\\spadtype\\{/g' \
        -e 's/\\\\axiomcommand\\{/\\\\spadcommand\\{/g' \
        -e 's/\\\\axiomOp\\{/\\\\spadop\\{/g' \
        -e 's/\\\\axiomOpFrom\\{/\\\\spadopFrom\\{/g' \
        -e 's/\\\\axiomSig\\{/\\\\spadsig\\{/g' \
        $f
done

A few manual replacement that were not caught by the script above in
the following files.
  src/algebra/cra.spad
  src/algebra/triset.spad
  src/doc/ht/HTXFormatPage8.ht
  src/doc/htex/ug12.htex
  src/doc/htex/ug13.htex
  src/doc/htex/ug21.htex

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1768 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
remove obsolete \axiom* commands from util.ht
ee139b5 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1769 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix recent breakage
bdb56af 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1770 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
properly protect against failure
71d898e 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1771 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix 'throwKeyedMsgCannotCoerceWithValue'
7c2ca2c 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1772 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
linearize literate documentation of xhash.spad
c6a9d52 
xhash.spad is nearly a LaTeX file. Instead of noweb markup there is now
  )if LiterateDoc
and
  )endif
around the LaTeX part. To turn the .spad file into a .tex file,
one basically has to replace ")if LiterateDoc" by "\end{lstlisting}"
and ")endif" by "\begin{lstlisting}". The following awk code does
exactly that, but it also takes care of ")abbrev" appearing at the
beginning of the file and moves it into the first code chunk.
Furthermore, empty lines after ")endif" and empty lines before ")if
LiterateDoc" are moved from the code into the documentation part

Usage: awk -f totex.awk xhash.spad > xhash.tex

--- totex.awk
/^)abb[a-z]* / && abbrev_seen==0 {abbrev=$0; abbrev_seen=1; next}

/^$/ {emptyline++; next}

/^)if LiterateDoc/ {
    if (open_code) {print "\\end{lstlisting}"; open_code=0}
    while (emptyline>0) {print ""; emptyline--}
    open_literal=1
    open_code=0
    next
}

/^)endif/ {
    if (!open_literal) {print; next}
    open_literal=0
    open_code=1
    # swallow the following empty lines and only output something if
    # there is a non-empty line following.
    while (getline > 0) {
        if ($0 != "") {
            while (emptyline>0) {print ""; emptyline--}
            print "\\begin{lstlisting}[language=spad]"
            if (abbrev) {print abbrev; abbrev=""}
            print
            next
        }
        emptyline++
    }
    # coming here means EOF or error in reading
    next
}

{
    while (emptyline>0) {print ""; emptyline--}
    print
}

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1773 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Remove unneded literate boilerplate
cca73ea 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1774 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix in tree build
8006bf0 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1775 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Clean up after commit 1774
2261e78 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1776 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
add missing hashUpdate!
ac1b6de 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1777 b0c55286-4f34-0410-a049-a1e7e93b0762
hebisch and others added 16 commits May 23, 2014 17:07
@hebisch
More portable version of unpack_file
0419bea 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1778 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Make sure .spad files are correct Spad
6282cdc 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1779 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix gcd failure due to bad reduction.
25ebb18 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1780 b0c55286-4f34-0410-a049-a1e7e93b0762
@hemmecke
bugfix subset?
642a173 
Before we had:
(1) -> SI ==> Set Integer
(2) -> SSI ==> Set SI
(3) -> si:SI := set [2]
   (3)  {2}
(4) -> subset?(si,si)
   (4)  true
(5) -> ssi: SSI := set [si]
   (5)  {{2}}
(6) -> subset?(ssi,ssi)
   (6)  false

With the patch also (6) gives true.

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1781 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix toplevel multiparameter macros.
c1f6376 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1782 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Fix handling of '\/' and '/\'.
b13cd8d 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1783 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Minor cleanups.
82240d0 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1784 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
Remove useless conditions
e1f3710 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1785 b0c55286-4f34-0410-a049-a1e7e93b0762
@hebisch
s/Formater/Formatter/
0cd2038 
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1786 b0c55286-4f34-0410-a049-a1e7e93b0762
Add in-place and out-of-place version of a counting bubble sort algor…
9e25aed 
…ithm
Implementation of a simple merge sort algorithm
ab6cc70
Counting version of merge sort
c652410
Counting insertion sort algorithms
6512d36
Fix typo
2db685e
@hebisch
Change difference of interval to agree with definition as interval op…
f729187 
…eration.

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1787 b0c55286-4f34-0410-a049-a1e7e93b0762
Merge branch 'master' of git://github.com/fricas/fricas into bubblesort
3cbe4f0
raoulb pushed a commit to raoulb/fricas that referenced this pull request Feb 4, 2015
@hemmecke
fix RootFSSplit argument
d3164c0 
Before this patch, the aldor compilation of libaxiom.al gave:

aldor -Wname=axiom -Mno-abbrev -Mpreview -Y al -L
AxiomLib=axiom_RFSSPLIT -fao=ao/RFSSPLIT.ao ap/RFSSPLIT.ap
(Message Preview)
"ap/RFSSPLIT.ap", line 11:
                (|Declare| |hemmecke#2| (|Apply| |FunctionSpace| |hemmecke#1|)))
.........................................................^
[L11 C58] hemmecke#1 (Error) Argument 1 of `FunctionSpace' did not match any
possible parameter type.
    The rejected type is Join(IntegralDomain, RetractableTo(Integer)) with .
    Expected type Comparable.

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1834 b0c55286-4f34-0410-a049-a1e7e93b0762
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@raoulb @hebisch @hemmecke