Skip to content

Commit

Permalink
edited RC line in .pro, edited speed section in doc
Browse files Browse the repository at this point in the history
  • Loading branch information
seub committed Oct 28, 2012
1 parent a9729a1 commit 0f6b4a0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CirclePackings.pro
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ SOURCES += \
RESOURCES += \
resources.qrc

win32:RC_FILE = myapp.rc
win32:RC_FILE = CirclePackings.rc
unix:ICON = images/icon.ico
2 changes: 1 addition & 1 deletion CirclePackings.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.5.2, 2012-10-28T14:24:50. -->
<!-- Written by Qt Creator 2.5.2, 2012-10-28T14:43:20. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down
10 changes: 4 additions & 6 deletions doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ <h3> Linux (or UNIX) users: </h3>
the sources. Note that installing the package will only work on Debian-based distributions (Debian, Ubuntu, Mint...). </p>

<h4> Install the package (Debian-based distributions): </h4>
<p> Download and install <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-32.deb">this package</a> (32 bits, works on all systems)
<p> Download and install <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-32.deb">this package</a>
(32 bits, works on all systems but is slower)
or <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-64.deb">this package</a> (64 bits systems only). </p>

<p> Installing the package can be done by
Expand Down Expand Up @@ -457,11 +458,8 @@ <h3> Convergence and speed </h3>
<p> If the computation doesn't seem to go anywhere, just clicking the "Stop" button should do. The program will still show you the result of its
computations, you so might see some total nonsense. </p>

<p> Note that the speed of computation will depend on your hardware (obvisously). In particular, having several processor cores will definitely
speed it up (because the program launches two to six threads depending on the mode). You could try the following speed test: choose
"Draw Two Curves mode", and select "Rectangle" for each curve. Set the tiling size
to 3 and click on the "Compute" button. Here are sample performances: on an "old" laptop with two cores @1.7Ghz, it took ~140s, compared to ~17.5s on
a recent laptop with 8 cores @2.2Ghz. </p>
<p> Note that the speed of computation will depend on your hardware (obvisously). In particular, having several logical cores will definitely
speed it up. Also, it seems that Linux does a better job than Windows, and 64 bits systems are faster than 32 bits systems.</p>

<h3> The interface is slow and lagging / freezing... </h3>
<p> We haven't tried the program on many computers yet, but it's possible that some features are demanding in terms of performances, especially if
Expand Down
14 changes: 6 additions & 8 deletions doc/index.html~
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@

<h3> Mac users: </h3>

<p> Download <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings.dmg">this app file</a>
and move it to your applications directory. </p>
<p> Download <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings.dmg">this dmg file</a>
and install it. </p>
<p> You may also compile the application from the sources: follow the same procedure as Linux users.</p>

<h3> Linux (or UNIX) users: </h3>
Expand All @@ -196,7 +196,8 @@
the sources. Note that installing the package will only work on Debian-based distributions (Debian, Ubuntu, Mint...). </p>

<h4> Install the package (Debian-based distributions): </h4>
<p> Download and install <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-32.deb">this package</a> (32 bits, works on all systems)
<p> Download and install <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-32.deb">this package</a>
(32 bits, works on all systems but is slower)
or <a href="https://github.com/downloads/seub/CirclePackings/CirclePackings-64.deb">this package</a> (64 bits systems only). </p>

<p> Installing the package can be done by
Expand Down Expand Up @@ -457,11 +458,8 @@
<p> If the computation doesn't seem to go anywhere, just clicking the "Stop" button should do. The program will still show you the result of its
computations, you so might see some total nonsense. </p>

<p> Note that the speed of computation will depend on your hardware (obvisously). In particular, having several processor cores will definitely
speed it up (because the program launches two to six threads depending on the mode). You could try the following speed test: choose
"Draw Two Curves mode", and select "Rectangle" for each curve. Set the tiling size
to 3 and click on the "Compute" button. Here are sample performances: on an "old" laptop with two cores @1.7Ghz, it took ~140s, compared to ~17.5s on
a recent laptop with 8 cores @2.2Ghz. </p>
<p> Note that the speed of computation will highly depend on your hardware (obvisously). In particular, having several logical cores will definitely
speed it up.</p>

<h3> The interface is slow and lagging / freezing... </h3>
<p> We haven't tried the program on many computers yet, but it's possible that some features are demanding in terms of performances, especially if
Expand Down

0 comments on commit 0f6b4a0

Please sign in to comment.