[kde-doc-english] [kartesio] /: Cleaning the repo
Luca Tringali
tringalinvent at libero.it
Sat Aug 29 21:31:54 UTC 2015
Git commit fd0bbe88361128dc33cf3f951abd7fa20f609254 by Luca Tringali.
Committed on 29/08/2015 at 21:29.
Pushed by lucatringali into branch 'master'.
Cleaning the repo
D +0 -25 CMakeLists.txt
D +0 -10 Messages.sh
D +0 -59 cmake-mod/Findzorbaneural.cmake
D +0 -5 doc/CMakeLists.txt
D +0 -295 doc/index.docbook
D +0 -71 doc/man-kartesio.1.docbook
D +- -- doc/neuralnet1.png
D +- -- doc/neuralnet2.png
D +- -- doc/neuralnet3.png
D +- -- doc/quick-start.png
D +- -- doc/redraw.png
D +- -- doc/regression1.png
D +- -- doc/regression2.png
D +- -- doc/regression3.png
D +- -- doc/regression4.png
D +- -- doc/regression5.png
D +- -- doc/rms.png
D +0 -7 icons/CMakeLists.txt
D +- -- icons/hi128-app-kartesio.png
D +- -- icons/hi16-app-kartesio.png
D +- -- icons/hi256-app-kartesio.png
D +- -- icons/hi32-app-kartesio.png
D +- -- icons/hi64-app-kartesio.png
D +- -- icons/kartesio.png
D +0 -188 icons/kartesio.svg
D +0 -24 parabola.kartesio
D +0 -31 src/CMakeLists.txt
D +0 -599 src/calculations.cpp
D +0 -125 src/calculations.h
D +0 -88 src/kartesio.desktop
D +0 -39 src/kartesioui.rc
D +0 -69 src/main.cpp
D +0 -540 src/mainwindow.cpp
D +0 -74 src/mainwindow.h
D +0 -509 src/mainwindow.ui
http://commits.kde.org/kartesio/fd0bbe88361128dc33cf3f951abd7fa20f609254
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 9438a0d..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-project(kartesio)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake-mod/")
-
-find_package(KDE4 REQUIRED)
-find_package( Qt4 REQUIRED )
-find_package(zorbaneural REQUIRED)
-add_definitions(${KDE4_DEFINITIONS} ${QT_DEFINITIONS})
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-include(KDE4Defaults)
-INCLUDE( ${QT_USE_FILE} )
-
-# detect oxygen icon dir at configure time based on KDEDIRS - there may be different package installation locations
-execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE _dir ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-file(TO_CMAKE_PATH "${_dir}" __dir)
-find_path(KDE4_ICON_DIR oxygen PATHS
- ${__dir}
-)
-message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
-
-
-add_subdirectory(src)
-add_subdirectory(icons)
-add_subdirectory(doc)
diff --git a/Messages.sh b/Messages.sh
deleted file mode 100755
index 853bd8c..0000000
--- a/Messages.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!bin/sh
-
-# invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources
-# the results are stored in a pseudo .cpp file to be picked up by xgettext.
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-# if your application contains tips-of-the-day, call preparetips as well.
-#$PREPARETIPS > tips.cpp
-# call xgettext on all source files. If your sources have other filename
-# extensions besides .cc, .cpp, and .h, just add them in the find call.
-$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kartesio.pot
\ No newline at end of file
diff --git a/cmake-mod/Findzorbaneural.cmake b/cmake-mod/Findzorbaneural.cmake
deleted file mode 100644
index e37c884..0000000
--- a/cmake-mod/Findzorbaneural.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-#/***************************************************************************
-# * Kartesio is a program for calculating best fit curves with *
-# * experimental points using regression algorithms or neural networks. *
-# * *
-# * Kartesio has been created by *
-# * Luca Tringali, TRINGALINVENT at libero.it *
-# * *
-# * Copyright 2011-2013 Luca Tringali *
-# * *
-# * This program 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 2 of the License, or *
-# * (at your option) any later version. *
-# * *
-# * This program 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 02110-1301, USA. *
-# ***************************************************************************/
-
-
-#locate libzorbaneural library
-
-# This module defines
-# LIBZORBANEURAL_LIBRARY
-# LIBZORBANEURAL_FOUND
-# LIBZORBANEURAL_INCLUDE_DIR
-# LIBZORBANEURAL_CFLAGS
-# LIBZORBANEURAL_LINKFLAGS
-
-
-IF(LIBZORBANEURAL_LIBRARY AND LIBZORBANEURAL_INCLUDE_DIR)
- SET(LIBZORBANEURAL_FOUND TRUE)
-ELSE(LIBZORBANEURAL_LIBRARY AND LIBZORBANEURAL_INCLUDE_DIR)
- INCLUDE(UsePkgConfig)
- PKGCONFIG("libzorbaneural" _libzorbaneuralIncDir _libzorbaneuralLibDir _libzorbaneuralLinkFlags _libzorbaneuralCflags)
-
- # set additional flags needed to compile/link against libzorbaneural
- SET(LIBZORBANEURAL_CFLAGS ${_libzorbaneuralCFlags} CACHE STRING "CFLAGS required for libzorbaneural")
- SET(LIBZORBANEURAL_LINKFLAGS ${_libzorbaneuralLinkFlags} CACHE STRING "Flags used for linking against libzorbaneural")
-
- # search for include and library path
- FIND_PATH(LIBZORBANEURAL_INCLUDE_DIR libzorbaneural/neuralnet.h PATHS ${_libzorbaneuralIncDir} ${_libzorbaneuralIncDir}/libzorbaneural)
- FIND_LIBRARY(LIBZORBANEURAL_LIBRARY zorbaneural PATHS ${_libzorbaneuralLibDir})
-
- IF(LIBZORBANEURAL_INCLUDE_DIR AND LIBZORBANEURAL_LIBRARY)
- SET(LIBZORBANEURAL_FOUND TRUE)
- MESSAGE(STATUS "Found libzorbaneural: ${LIBZORBANEURAL_LIBRARY}")
-
- ELSE(LIBZORBANEURAL_INCLUDE_DIR AND LIBZORBANEURAL_LIBRARY)
- SET(LIBZORBANEURAL_FOUND FALSE)
- MESSAGE(SEND_ERROR "Could NOT find libzorbaneural: you can download it from https://www.gitorious.org/zorbaneural/zorbaneural/trees/master/binary-packages/libzorbaneural-0.1.")
- ENDIF(LIBZORBANEURAL_INCLUDE_DIR AND LIBZORBANEURAL_LIBRARY)
-ENDIF(LIBZORBANEURAL_LIBRARY AND LIBZORBANEURAL_INCLUDE_DIR)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 637a494..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-########### install files ###############
-#
-
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kartesio)
-kde4_create_manpage(man-kartesio.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/doc/index.docbook b/doc/index.docbook
deleted file mode 100644
index ce6d095..0000000
--- a/doc/index.docbook
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!-- <!ENTITY kappname "Kartesio">
- <!ENTITY package "kdeedu">
- <!ENTITY % addindex "IGNORE"> -->
- <!ENTITY % English "INCLUDE"><!-- change language only here -->
- ]>
-
- <book lang="&language;">
-
- <bookinfo>
- <title>The Kartesio Handbook</title>
-
- <authorgroup>
- <author>
- <firstname>Luca</firstname>
- <surname>Tringali</surname>
- <affiliation>
- <address>TRINGALINVENT at libero.it</address>
- </affiliation>
- </author>
-
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
-
- </authorgroup>
-
- <copyright>
- <year>2013</year>
- <holder>Luca Tringali</holder>
- </copyright>
-
- <legalnotice>&FDLNotice;</legalnotice>
-
- <date>2013-05-07</date>
- <releaseinfo>0.1.00 (&kde; 4.11)</releaseinfo>
-
- <abstract>
- <para>Kartesio is a program for calculating best fit curves with
- experimental points using regression algorithms or neural networks.</para>
- </abstract>
-
- <keywordset>
- <keyword>KDE</keyword>
- <keyword>education</keyword>
- <keyword>university</keyword>
- <keyword>physics</keyword>
- <keyword>kartesio</keyword>
- </keywordset>
-
- </bookinfo>
-
- <chapter id="introduction">
- <title>Introduction</title>
-
- <para>Kartesio is a program for calculating best fit curves with
- experimental points using regression algorithms or neural networks.
- It is free and licensed under the &GNU; Public License.
- </para>
-
- <para>Kartesio has a simple interface that allows you to plot points
- and a curve. The curve is usually calculated by the program, but you
- can also write it by yourself.</para>
-
- </chapter>
-
- <chapter id="quick-start">
- <title>Kartesio quick start guide</title>
-
- <para>As soon as you open Kartesio, you will get a blank table and a blank plot. This is also the same screen you can get in every moment just clicking on (<menuchoice> <guimenu>File</guimenu> <guimenuitem>New</guimenuitem> </menuchoice>). You can try to best fit your experimental points with a regression algorithm or a neural network, using the tools in the appropriate tab. Please note that regression algorithm needs <application>maxima</application> to be installed on your computer, while the neural network method needs ZorbaNeural.</para>
- <screenshot>
- <screeninfo>Kartesio main window</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="quick-start.png" format="PNG" /></imageobject>
- <textobject><phrase>Kartesio main window</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- </chapter>
- <chapter id="regression">
- <title>Regression</title>
-
- <para>
- You should start adding your points to the table. Obviously, a bidimensional point is identified with two coordinates (on X and Y axis).
- </para>
-
- <screenshot>
- <screeninfo>Adding points</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="regression1.png" format="PNG" /></imageobject>
- <textobject><phrase>Adding points</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>In the <guilabel>Regression</guilabel> tab, you can write a generic function that will be used by Kartesio as a model for the fitting curve. The function must be written with the variables x and y, and with variable coefficients (represented by letters). Obviously, you can also write numeric coefficients. Please take note that the function must be biunique.</para>
-
- <screenshot>
- <screeninfo>Writing a generic function</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="regression2.png" format="PNG" /></imageobject>
- <textobject><phrase>Writing a generic function</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>Clicking the <guibutton>Best fit</guibutton> button, Kartesio will start to calculate coefficients for the function you wrote, trying to best fit the experimental points. The final function will appear the edit box close to the bottom edge of the window.</para>
-
- <screenshot>
- <screeninfo>Best fit done</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="regression3.png" format="PNG" /></imageobject>
- <textobject><phrase>Best fit done</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>After the fit operation, points and the curve will be automatically plotted. Anyway, you may prefer to change to plotted area to see better the image. This can be done using the four spinboxes: <guilabel>X min</guilabel> is the minimum value of X axis, and <guilabel>X max</guilabel> is the maximum value. For example, if you write respectively 0 and 1, then the plot will start from 0 and end to 1. The same logic works for Y axis.</para>
-
- <screenshot>
- <screeninfo>A closer look</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="regression4.png" format="PNG" /></imageobject>
- <textobject><phrase>A closer look</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>If you change plot limits, you may need to change also the resolution: if the resolution of the plot is too little, you will see every curve as a single line. If the resolution is too high you will waste a lot of CPU time to draw the plot.</para>
-
- <screenshot>
- <screeninfo>Higher resolution</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="regression5.png" format="PNG" /></imageobject>
- <textobject><phrase>Higher resolution</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- </chapter>
-
- <chapter id="neuralnet">
- <title>Neural Network</title>
-
- <para>
- The neural network method works like the regression one, but you can not write you own function: you must choose it from a list. This list, anyway, contains practically every kind of function you may want (periodic functions are not usable with a neural network).
- </para>
-
- <screenshot>
- <screeninfo>Choosing the correct function</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="neuralnet1.png" format="PNG" /></imageobject>
- <textobject><phrase>Choosing the correct function</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>Usually, back propagation training is just what you need. For this reason it is checked by default. Just modify the number of iterations (it should not be too high, or the process may end up with way too strange value) and then press the <guibutton>Calculate</guibutton> button. Please take note that the neural network, exactly as a human brain, may give you different results: if you press the <guibutton>Calculate</guibutton> button more than once and you will find out that the network calculates every time a different best fitting curve.</para>
-
- <screenshot>
- <screeninfo>Back propagation training</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="neuralnet2.png" format="PNG" /></imageobject>
- <textobject><phrase>Back propagation training</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>If you are not satisfied by the back propagation training result, you could also use the genetic algorithm training. This can be done simply checking the appropriate checkbox. Genetic algorithm training takes a lot more CPU resources, so you better use a very low iterations number (not more than 500). </para>
-
- <screenshot>
- <screeninfo>Genetic algorithm training</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="neuralnet3.png" format="PNG" /></imageobject>
- <textobject><phrase>Genetic algorithm training</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- </chapter>
-
- <chapter id="others">
- <title>Other useful things</title>
-
- <para>
- Sometimes it is useful to redraw the plot. For example, it is if you have manually changed the best fitting curve or if you edited some points and you don't want to recalculate the fitting function. Just use the <guibutton>Draw Plot</guibutton> button.
- </para>
-
- <screenshot>
- <screeninfo>Draw plot</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="redraw.png" format="PNG" /></imageobject>
- <textobject><phrase>Draw plot</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- <para>
- To know how much the fitting curve is different from your experimental points, you can look at the root mean square error. To add it to the plot, it is needed to check the checkbox <guilabel>Show RMS error</guilabel>. Then press the <guibutton>Draw Plot</guibutton> button to redraw the plot: it should contain a red label with the RMS error.
- </para>
-
- <screenshot>
- <screeninfo>Showing RMS error</screeninfo>
- <mediaobject>
- <imageobject><imagedata fileref="rms.png" format="PNG" /></imageobject>
- <textobject><phrase>Showing RMS error</phrase></textobject>
- </mediaobject>
- </screenshot>
-
- </chapter>
-
- <chapter id="faq">
- <title>Questions and Answers</title>
-
- <qandaset id="faqlist">
- <qandaentry>
- <question>
- <para>Will I ever have to pay for Kartesio?</para>
- </question>
- <answer>
- <para>No, never. Kartesio is licensed
- under the <ulink url="http://www.gnu.org/licenses/licenses.html#GPL">GPL</ulink>, so you will never have to pay for this program.</para>
- </answer>
- </qandaentry>
-
- </qandaset>
- </chapter>
-
- <chapter id="contribute">
- <title>How can I contribute?</title>
-
- <qandaset id="tasks">
- <qandaentry>
- <question>
- <para>Find some bugs or give some suggestions</para>
- </question>
- <answer>
- <para>
- If you find any bugs in the program, or have a few suggestions for
- improvements, please let me know at TRINGALINVENT at libero.it.
- </para>
- </answer>
-
- </qandaentry>
- </qandaset>
- </chapter>
-
- <chapter id="credits">
-
- <title>Credits and License</title>
- <para>Kartesio</para>
- <para>
- Program Copyright, 2010-2011 Luca Tringali
- TRINGALINVENT at libero.it
- </para>
-
- <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-
- &underFDL; <!-- FDL: do not remove -->
- &underGPL; <!-- GPL License -->
-
- </chapter>
-
- <appendix id="installation">
- <title>Installation</title>
-
- <sect1 id="getting-kartesio">
- <title>How to obtain Kartesio</title>
-
- &install.intro.documentation;
-
- </sect1>
-
- <sect1 id="web_presence">
- <title>Web Presence</title>
-
- <para>
- Kartesio itself can be found on <ulink
- url="http://www.zorbaproject.org/kartesio">The Kartesio home page</ulink> and
- is part of the KDE-Edu project</para>
-
- </sect1>
-
- <sect1 id="compilation">
- <title>Compilation and Installation</title>
-
- &install.compile.documentation;
-
- </sect1>
-
- </appendix>
-
- &documentation.index;
- </book>
- <!--
- Local Variables:
- mode: sgml
- sgml-minimize-attributes:nil
- sgml-general-insert-case:lower
- sgml-indent-step:0
- sgml-indent-data:nil
- End:
-
- // vim:ts=2:sw=2:tw=78:noet:noai
- -->
diff --git a/doc/man-kartesio.1.docbook b/doc/man-kartesio.1.docbook
deleted file mode 100644
index bb8d894..0000000
--- a/doc/man-kartesio.1.docbook
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
-]>
-
-<refentry lang="&language;">
-<refentryinfo>
-<title>KDE User's Manual</title>
-<author><firstname>Luca</firstname><surname>Tringali</surname> <contrib>Kartesio man page.</contrib>
-<email>TRINGALINVENT at libero.it</email></author>
-<date>2013-05-07</date>
-<productname>K Desktop Environment</productname>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle><command>kartesio</command></refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname><command>kartesio</command></refname>
-<refpurpose>A KDE based data analysis tool.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>kartesio</command>
-
-<group><option>KDE Generic Options</option></group>
-<group><option>Qt Generic Options</option></group>
-
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-
- <para>Kartesio is a program for calculating best fit curves with
-experimental points using regression algorithms or neural networks.
-</para>
-
-<para>Kartesio has a simple interface that allows you to plot points
-and a curve. The curve can be calculated by the program or you can also
-write it by yourself.</para>
-
-<para>This package is part of the official KDE edutainment module. </para>
-
-</refsect1>
-
-<refsect1>
-<title>See Also</title>
-
-<para>More detailed user documentation is available from <ulink
-url="help:/kartesio">help:/kartesio</ulink> (either enter this
-<acronym>URL</acronym> into &konqueror;, or run
-<userinput><command>khelpcenter</command>
-<parameter>help:/kartesio</parameter></userinput>).</para>
-
-
-</refsect1>
-
-<refsect1>
-<title>Authors</title>
-
-<para>Kartesio has been written by Luca Tringali - TRINGALINVENT at libero.it </para>
-
-<para>This manual page was prepared by <personname><firstname>Luca</firstname><surname>Tringali</surname></personname></para>
-
-</refsect1>
-
-</refentry>
diff --git a/doc/neuralnet1.png b/doc/neuralnet1.png
deleted file mode 100644
index 8a15f0b..0000000
Binary files a/doc/neuralnet1.png and /dev/null differ
diff --git a/doc/neuralnet2.png b/doc/neuralnet2.png
deleted file mode 100644
index ed002f7..0000000
Binary files a/doc/neuralnet2.png and /dev/null differ
diff --git a/doc/neuralnet3.png b/doc/neuralnet3.png
deleted file mode 100644
index 93cbe36..0000000
Binary files a/doc/neuralnet3.png and /dev/null differ
diff --git a/doc/quick-start.png b/doc/quick-start.png
deleted file mode 100644
index bc681aa..0000000
Binary files a/doc/quick-start.png and /dev/null differ
diff --git a/doc/redraw.png b/doc/redraw.png
deleted file mode 100644
index d211c29..0000000
Binary files a/doc/redraw.png and /dev/null differ
diff --git a/doc/regression1.png b/doc/regression1.png
deleted file mode 100644
index d75c6ae..0000000
Binary files a/doc/regression1.png and /dev/null differ
diff --git a/doc/regression2.png b/doc/regression2.png
deleted file mode 100644
index 530a57b..0000000
Binary files a/doc/regression2.png and /dev/null differ
diff --git a/doc/regression3.png b/doc/regression3.png
deleted file mode 100644
index b57f0a2..0000000
Binary files a/doc/regression3.png and /dev/null differ
diff --git a/doc/regression4.png b/doc/regression4.png
deleted file mode 100644
index 830288e..0000000
Binary files a/doc/regression4.png and /dev/null differ
diff --git a/doc/regression5.png b/doc/regression5.png
deleted file mode 100644
index 02e71fa..0000000
Binary files a/doc/regression5.png and /dev/null differ
diff --git a/doc/rms.png b/doc/rms.png
deleted file mode 100644
index 125abda..0000000
Binary files a/doc/rms.png and /dev/null differ
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
deleted file mode 100644
index 34e6ded..0000000
--- a/icons/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-kde4_install_icons(${ICON_INSTALL_DIR})
-
-#install(FILES hi16-app-kartesio.png DESTINATION ${PREFIX}/share/icons/hicolor/16/apps/kartesio.png)
-#install(FILES hi32-app-kartesio.png DESTINATION ${PREFIX}/share/icons/hicolor/32/apps/kartesio.png)
-#install(FILES hi64-app-kartesio.png DESTINATION ${PREFIX}/share/icons/hicolor/64/apps/kartesio.png)
-#install(FILES hi128-app-kartesio.png DESTINATION ${PREFIX}/share/icons/hicolor/128/apps/kartesio.png)
-#install(FILES hi256-app-kartesio.png DESTINATION ${PREFIX}/share/icons/hicolor/256/apps/kartesio.png)
diff --git a/icons/hi128-app-kartesio.png b/icons/hi128-app-kartesio.png
deleted file mode 100644
index beabf95..0000000
Binary files a/icons/hi128-app-kartesio.png and /dev/null differ
diff --git a/icons/hi16-app-kartesio.png b/icons/hi16-app-kartesio.png
deleted file mode 100644
index d9fcdc0..0000000
Binary files a/icons/hi16-app-kartesio.png and /dev/null differ
diff --git a/icons/hi256-app-kartesio.png b/icons/hi256-app-kartesio.png
deleted file mode 100644
index fcc11a5..0000000
Binary files a/icons/hi256-app-kartesio.png and /dev/null differ
diff --git a/icons/hi32-app-kartesio.png b/icons/hi32-app-kartesio.png
deleted file mode 100644
index 1921fd7..0000000
Binary files a/icons/hi32-app-kartesio.png and /dev/null differ
diff --git a/icons/hi64-app-kartesio.png b/icons/hi64-app-kartesio.png
deleted file mode 100644
index cc06fa4..0000000
Binary files a/icons/hi64-app-kartesio.png and /dev/null differ
diff --git a/icons/kartesio.png b/icons/kartesio.png
deleted file mode 100644
index fcc11a5..0000000
Binary files a/icons/kartesio.png and /dev/null differ
diff --git a/icons/kartesio.svg b/icons/kartesio.svg
deleted file mode 100644
index cb2cd71..0000000
--- a/icons/kartesio.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="503"
- height="503"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="kartesio.svg"
- inkscape:export-filename="/home/luca/Progetti/kartesio/kartesio/icons/kartesio-150dpi.png"
- inkscape:export-xdpi="150"
- inkscape:export-ydpi="150">
- <defs
- id="defs4">
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3837"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3833"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3829"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3763"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect2991"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect2987"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3763-7"
- is_visible="true" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.98994949"
- inkscape:cx="235.09365"
- inkscape:cy="253.55483"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1280"
- inkscape:window-height="741"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
- inkscape:window-maximized="1"
- fit-margin-top="10"
- fit-margin-left="10"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Livello 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-53.714286,-163.64789)">
- <path
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 67.714286,426.07647 460.000004,0"
- id="path2985"
- inkscape:path-effect="#path-effect2987"
- inkscape:original-d="m 67.714286,426.07647 460.000004,0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 301.71429,218.36218 2.85714,414.28572"
- id="path2989"
- inkscape:path-effect="#path-effect2991"
- inkscape:original-d="m 301.71429,218.36218 2.85714,414.28572"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 525.25902,408.20974 1.01015,38.3858 22.22336,-20.20305 -23.23351,-18.18275"
- id="path3761"
- inkscape:path-effect="#path-effect3763"
- inkscape:original-d="m 525.25902,408.20974 1.01015,38.3858 22.22336,-20.20305 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 282.29057,218.86807 38.39032,0.82043 -19.12094,-23.16097 -19.26938,22.34054"
- id="path3761-4"
- inkscape:path-effect="#path-effect3763-7"
- inkscape:original-d="m 282.29057,218.86807 38.39032,0.82043 -19.12094,-23.16097 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc"
- inkscape:transform-center-x="-27.274119"
- inkscape:transform-center-y="-6.0609153" />
- <path
- sodipodi:type="arc"
- style="fill:#0000f8;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3786"
- sodipodi:cx="401.53564"
- sodipodi:cy="316.46606"
- sodipodi:rx="10.606602"
- sodipodi:ry="10.606602"
- d="m 412.14225,316.46606 a 10.606602,10.606602 0 1 1 -21.21321,0 10.606602,10.606602 0 1 1 21.21321,0 z"
- transform="translate(2,-32)" />
- <path
- transform="translate(65.134527,-66.850274)"
- sodipodi:type="arc"
- style="fill:#0000f8;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3786-2"
- sodipodi:cx="401.53564"
- sodipodi:cy="316.46606"
- sodipodi:rx="10.606602"
- sodipodi:ry="10.606602"
- d="m 412.14225,316.46606 a 10.606602,10.606602 0 1 1 -21.21321,0 10.606602,10.606602 0 1 1 21.21321,0 z" />
- <path
- transform="translate(-38.911185,42.246201)"
- sodipodi:type="arc"
- style="fill:#0000f8;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3786-7"
- sodipodi:cx="401.53564"
- sodipodi:cy="316.46606"
- sodipodi:rx="10.606602"
- sodipodi:ry="10.606602"
- d="m 412.14225,316.46606 a 10.606602,10.606602 0 1 1 -21.21321,0 10.606602,10.606602 0 1 1 21.21321,0 z" />
- <path
- transform="translate(-137.90614,174.57619)"
- sodipodi:type="arc"
- style="fill:#0000f8;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3786-5"
- sodipodi:cx="401.53564"
- sodipodi:cy="316.46606"
- sodipodi:rx="10.606602"
- sodipodi:ry="10.606602"
- d="m 412.14225,316.46606 a 10.606602,10.606602 0 1 1 -21.21321,0 10.606602,10.606602 0 1 1 21.21321,0 z" />
- <path
- transform="translate(-258.11429,208.92137)"
- sodipodi:type="arc"
- style="fill:#0000f8;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3786-28"
- sodipodi:cx="401.53564"
- sodipodi:cy="316.46606"
- sodipodi:rx="10.606602"
- sodipodi:ry="10.606602"
- d="m 412.14225,316.46606 a 10.606602,10.606602 0 1 1 -21.21321,0 10.606602,10.606602 0 1 1 21.21321,0 z" />
- <path
- style="fill:none;stroke:#00ff00;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 467.68032,230.42289 c -28.5434,7.76753 -54.10569,26.02631 -70.71067,50.50763 -22.57258,33.27958 -27.81207,75.07391 -43.43656,112.12694 -11.81576,28.02075 -30.22368,53.89023 -55.55839,70.71067 -21.61139,14.34843 -47.05654,21.48034 -71.7412,29.45513 -24.68466,7.97479 -49.76718,17.42914 -68.67,35.19464 -14.05326,13.20772 -24.04005,30.68459 -28.28428,49.49747"
- id="path3831"
- inkscape:path-effect="#path-effect3833"
- inkscape:original-d="m 467.68032,230.42289 c 0,0 -45.07066,28.41297 -70.71067,50.50763 -25.64002,22.09465 -26.09906,81.6897 -43.43656,112.12694 -17.33751,30.43724 -23.57039,45.46365 -55.55839,70.71067 -31.98801,25.24701 -120.62964,37.93716 -140.4112,64.64977 -19.78156,26.7126 -28.28428,49.49747 -28.28428,49.49747"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="czzzzc" />
- <path
- style="fill:#000000"
- d="m 124.83434,400.23331 c 0.0519,-24.02595 0.13922,-26.09149 1.10523,-26.13666 0.64669,-0.0303 0.75113,-0.1692 0.27235,-0.36239 -0.94907,-0.38296 -1.03075,-1.45228 -0.11093,-1.45228 0.36608,0 1.09274,-0.42713 1.61479,-0.94917 0.75727,-0.75729 0.79572,-1.13407 0.19017,-1.86372 -0.95682,-1.1529 -0.0453,-1.15552 1.47437,-0.004 0.7165,0.54282 0.96405,1.1788 0.65729,1.68865 -0.38524,0.6403 -0.26535,0.63399 0.55219,-0.0291 0.57435,-0.46582 0.8894,-1.09752 0.70012,-1.40378 -0.45036,-0.72869 2.02382,-3.85978 3.18462,-4.03015 0.49535,-0.0726 0.90063,0.13924 0.90063,0.47085 0,0.33161 0.28032,0.42969 0.62292,0.21795 0.41194,-0.25459 0.39601,-0.80898 -0.047,-1.63678 -0.60413,-1.12884 -0.54728,-1.18616 0.57872,-0.58354 1.80482,0.96591 2.39052,0.82065 0.98315,-0.24384 -0.66325,-0.50165 -1.00315,-0.92099 -0.75535,-0.93186 0.2478,-0.0109 0.18859,-0.70875 -0.13158,-1.55085 -0.75438,-1.98418 -0.0531,-2.37429 1.70662,-0.94937 0.96034,0.77763 1.15389,1.23062 0.61813,1.44664 -0.45478,0.18337 -0.30926,0.33495 0.34902,0.36354 0.89215,0.0388 1.03751,-0.24421 0.69281,-1.34873 -0.57183,-1.83235 -1.50571,-2.41634 -3.21963,-2.01337 -1.16873,0.27478 -1.39778,0.0703 -1.39778,-1.24813 0,-1.37168 0.20201,-1.52607 1.55309,-1.18696 0.90293,0.22661 1.55309,0.1222 1.55309,-0.24943 0,-0.35157 -0.76878,-0.81001 -1.7084,-1.01875 -1.3433,-0.29842 -2.08353,-1.18284 -3.46372,-4.13836 -1.0866,-2.32685 -1.58153,-4.1536 -1.29915,-4.79505 0.25088,-0.56991 0.41177,-1.24587 0.35753,-1.50213 -0.0542,-0.25626 0.31834,-0.46593 0.82796,-0.46593 0.50962,0 1.27576,-0.55911 1.70253,-1.24248 0.42676,-0.68336 1.3377,-1.2749 2.02429,-1.31453 1.04674,-0.0605 1.07277,-0.11795 0.16118,-0.35618 -1.45545,-0.38035 -1.37723,-1.25968 0.15531,-1.74609 0.68336,-0.2169 1.24247,-0.6463 1.24247,-0.95422 0,-0.30794 -0.47548,-0.37742 -1.05663,-0.15441 -0.58116,0.22301 -0.0955,-0.60469 1.07927,-1.83933 2.05776,-2.16267 3.48618,-2.7617 1.83168,-0.76815 -0.58841,0.70899 -0.62177,1.1591 -0.12291,1.65797 0.49886,0.49886 0.80345,0.19656 1.12192,-1.1135 0.24044,-0.98905 1.23436,-2.52209 2.20872,-3.40677 0.97436,-0.88468 1.77157,-1.94179 1.77157,-2.34914 0,-0.40735 0.44277,-0.91054 0.98395,-1.11821 0.79474,-0.30497 0.8246,-0.48256 0.1553,-0.92354 -0.63807,-0.42041 -0.40004,-0.90277 1.03508,-2.0975 3.92713,-3.26931 4.49801,-4.30404 4.99743,-9.05797 0.15179,-1.44485 0.85877,-2.41412 1.76081,-2.41412 1.18889,0 3.5093,-2.95995 3.11859,-3.97812 -0.34249,-0.89252 1.75624,-2.50823 2.40952,-1.85496 0.49219,0.4922 1.32698,-2.33444 1.14945,-3.89208 -0.0839,-0.73614 0.1435,-1.52142 0.50536,-1.74507 0.36186,-0.22364 0.65792,-0.95821 0.65792,-1.63238 0,-1.9891 1.85564,-5.93154 2.38711,-5.07159 0.3388,0.54818 0.75367,0.41665 1.52415,-0.4832 1.17697,-1.3746 1.39015,-2.12165 0.43741,-1.53282 -0.34168,0.21117 -0.62124,0.0879 -0.62124,-0.27395 0,-0.36185 0.34945,-0.66009 0.77655,-0.66275 1.01146,-0.006 2.59154,-3.32466 1.72123,-3.61477 -1.11927,-0.37309 -0.69269,-1.19345 2.04951,-3.9415 1.47597,-1.47912 3.22101,-3.52798 3.87786,-4.55302 1.52065,-2.37303 2.07214,-3.09462 4.09591,-5.35929 2.38799,-2.67225 6.04033,-10.39361 6.25799,-13.22994 0.17154,-2.23553 1.66483,-4.02759 1.76545,-2.11869 0.024,0.45557 0.28393,0.2692 0.57758,-0.41416 0.45674,-1.06289 0.54022,-0.9686 0.57757,0.6523 0.024,1.04213 -0.26025,2.19869 -0.6317,2.57014 -0.45158,0.45158 -0.46581,0.80488 -0.0429,1.06624 0.83098,0.51357 1.10832,-0.0301 1.63309,-3.20151 0.36423,-2.20117 0.2692,-2.64026 -0.57143,-2.64026 -0.82845,0 -0.88507,-0.2303 -0.31739,-1.29102 0.38002,-0.71007 0.54148,-1.68051 0.3588,-2.15655 -0.52832,-1.3768 2.54736,-7.73471 3.74172,-7.73471 0.93766,0 0.92926,0.11792 -0.0884,1.24247 -0.61843,0.68337 -0.81137,1.24248 -0.42876,1.24248 0.95671,0 2.1532,-2.38486 1.73857,-3.46535 -0.41702,-1.08674 0.62197,-1.186 1.11764,-0.10677 0.19616,0.4271 0.1895,0.11254 -0.0148,-0.69903 -0.27417,-1.08917 -0.16619,-1.34873 0.41233,-0.99118 0.44995,0.27808 0.62806,0.23244 0.41817,-0.10718 -0.40889,-0.6616 0.48119,-2.39079 1.23815,-2.40537 0.26872,-0.005 1.24466,-0.77397 2.16875,-1.70841 0.92409,-0.93444 2.04232,-1.7009 2.48495,-1.70323 0.44264,-0.002 1.48141,-0.9977 2.3084,-2.21191 4.0105,-5.88839 12.63966,-11.23185 18.49465,-11.45251 9.85872,-0.37154 19.43143,0.032 22.86713,0.96389 11.70481,3.17489 14.31114,4.24532 17.1469,7.04226 4.16235,4.10537 6.77233,6.3661 6.78964,5.88111 0.0104,-0.29107 0.30508,-0.0378 0.65486,0.56287 0.34978,0.60065 0.47104,1.35894 0.26946,1.68511 -0.39976,0.64682 2.37956,6.52857 3.37595,7.14437 0.70734,0.43717 3.13569,5.71321 3.13569,6.81288 0,0.40423 0.83851,1.5926 1.86335,2.64084 1.54696,1.58226 1.7167,2.02759 0.99966,2.62268 -0.68197,0.56598 -0.71457,1.03842 -0.15495,2.24525 0.38981,0.84065 1.07469,1.53063 1.52196,1.5333 0.44727,0.002 0.64906,0.27045 0.44842,0.59508 -0.20063,0.32464 0.64906,1.51275 1.8882,2.64026 3.15781,2.87332 3.59073,3.88536 4.02197,9.40233 0.23483,3.00415 0.69476,5.0616 1.20152,5.37479 0.60056,0.37117 0.72221,1.46515 0.45297,4.07378 -0.3613,3.5007 -1.63842,6.22264 -1.72144,3.6689 -0.033,-1.01495 -0.13755,-0.96564 -0.64475,0.30406 -0.81778,2.04719 -0.11257,5.00254 1.19942,5.02642 0.88271,0.0161 0.85996,0.12213 -0.15222,0.70967 -1.15277,0.66915 -1.15419,0.71697 -0.0454,1.52778 0.62957,0.46035 0.95976,1.02192 0.73375,1.24793 -0.43996,0.43996 1.35612,2.03424 2.32876,2.06711 0.32157,0.0109 0.042,-0.39069 -0.62123,-0.89235 -0.66325,-0.50165 -0.89069,-0.92098 -0.50542,-0.93185 0.38526,-0.0109 1.04849,0.39958 1.47385,0.9121 0.42535,0.51252 1.28175,0.93185 1.90311,0.93185 0.62136,0 1.30252,0.27956 1.51369,0.62124 0.21117,0.34168 -0.21163,0.62124 -0.93956,0.62124 -1.20647,0 -1.23667,0.0868 -0.34158,0.98194 0.54007,0.54007 0.82797,1.23106 0.6398,1.53554 -0.18818,0.30449 0.14811,1.30184 0.74732,2.21636 0.59921,0.91451 1.04949,2.66963 1.00063,3.90028 -0.0875,2.20365 -0.0816,2.20931 0.39184,0.37382 0.33121,-1.28412 0.59788,-1.57391 0.85748,-0.93185 0.42391,1.04837 0.21766,4.17799 -0.36846,5.59114 -0.21257,0.51252 -0.46716,1.9103 -0.56574,3.10618 -0.12839,1.55737 -0.57588,2.34834 -1.57704,2.78758 -0.76878,0.33728 -1.39778,0.96902 -1.39778,1.40386 0,0.43485 -0.55912,1.26935 -1.24248,1.85447 -1.41392,1.21063 -1.60593,2.39514 -0.46592,2.87422 0.552,0.23197 0.45431,0.52972 -0.33785,1.02973 -0.75809,0.4785 -0.9851,1.11079 -0.71,1.97756 0.23849,0.75141 0.15949,1.1228 -0.19254,0.90524 -0.32833,-0.20292 -0.91739,0.33434 -1.30903,1.1939 -0.96524,2.11846 -0.90969,2.32221 0.53039,1.94562 0.93866,-0.24546 1.24248,-0.0191 1.24248,0.92587 0,0.81558 0.30196,1.1349 0.86785,0.91775 0.56078,-0.21519 0.96993,0.20093 1.15633,1.17601 0.17616,0.92151 -0.002,1.50904 -0.4589,1.50904 -0.80075,0 -2.18652,3.91339 -2.18652,6.17469 0,0.96812 0.31753,1.31011 1.08003,1.16327 1.38922,-0.26754 1.84924,-2.36806 0.51861,-2.36806 -1.28016,0 -1.23435,-0.37921 0.30737,-2.54436 1.5208,-2.13576 2.71213,-2.38956 2.0954,-0.4464 -0.40692,1.28209 -0.67249,3.38929 -0.82712,6.56287 -0.0375,0.76878 -0.36416,1.39779 -0.726,1.39779 -0.36185,0 -0.48513,-0.27956 -0.27396,-0.62124 0.71713,-1.16034 -1.27117,-0.62801 -2.34688,0.62834 -1.27042,1.48374 -1.34418,1.91146 -0.29338,1.7013 1.1208,-0.22416 0.97144,2.78779 -0.15531,3.13208 -0.75207,0.22979 -0.78204,0.12592 -0.15531,-0.53841 1.11931,-1.18646 0.9576,-1.81712 -0.46592,-1.81712 -1.41926,0 -1.6879,1.76419 -0.46593,3.0598 0.63665,0.67501 0.46877,0.76887 -0.93186,0.52101 -2.22743,-0.39418 -2.15557,-0.12121 0.31062,1.17992 l 2.01902,1.06523 -2.17433,0.65913 c -1.7748,0.53802 -2.13693,0.92302 -1.9708,2.09523 0.1527,1.07739 -0.064,1.38773 -0.8674,1.24248 -0.58902,-0.10649 -1.19314,0.15583 -1.34247,0.58293 -0.14934,0.4271 0.0478,0.77655 0.43814,0.77655 0.39032,0 0.53689,0.27955 0.32572,0.62123 -0.21117,0.34168 -0.11406,0.62124 0.2158,0.62124 0.32985,0 0.45148,0.56695 0.27027,1.2599 -0.22516,0.86101 -0.67445,1.1504 -1.41911,0.91405 -0.80062,-0.2541 -1.16834,0.0658 -1.38634,1.20626 -0.16319,0.85365 -0.0777,1.41671 0.19007,1.25125 0.58418,-0.36105 1.46937,2.13732 0.94356,2.66313 -0.20204,0.20204 -0.36734,0.0412 -0.36734,-0.35743 0,-0.39863 -0.24696,-0.72478 -0.54878,-0.72478 -0.73421,0 -1.45384,2.12318 -1.84419,5.44109 -0.0728,0.61914 -0.34393,0.62447 -1.30287,0.0256 -0.87571,-0.54689 -1.03287,-0.97072 -0.56776,-1.53114 0.94503,-1.13869 0.0384,-2.32644 -1.07223,-1.4047 -0.4821,0.40011 -0.87655,1.07998 -0.87655,1.5108 0,0.43084 -0.48922,0.9559 -1.08716,1.16681 -0.59794,0.21091 -1.40102,0.53451 -1.78462,0.7191 -0.3836,0.18459 -0.853,-0.25924 -1.04313,-0.98629 -0.38983,-1.49069 -2.20844,-1.47281 -2.91087,0.0286 -0.23978,0.51252 -0.75896,1.55707 -1.15375,2.32121 -0.39479,0.76415 -0.71779,1.81249 -0.71779,2.32965 0,0.51715 -0.27105,0.94028 -0.60232,0.94028 -1.10987,0 -0.46326,4.63056 0.91087,6.523 2.66936,3.6762 3.41471,6.16416 3.28261,10.95722 -0.1337,4.85108 0.33459,6.42203 1.75219,5.87804 0.56317,-0.21611 0.86902,0.0969 0.86902,0.8895 0,1.63261 -0.21517,2.18665 -0.77654,1.99953 -0.99126,-0.33042 -0.3865,0.71794 1.39778,2.4231 1.70082,1.6254 2.14253,2.48936 1.93728,3.78928 -0.0404,0.25626 0.69521,0.46974 1.63484,0.47441 2.66014,0.0132 4.50397,0.6752 4.50397,1.61706 0,0.47267 0.41933,0.85941 0.93186,0.85941 1.04454,0 1.27042,1.58114 0.31061,2.17433 -0.34168,0.21117 -0.62123,0.0879 -0.62123,-0.27396 0,-0.81671 -2.2784,-0.87347 -2.7755,-0.0691 -0.20013,0.32382 0.18658,0.48275 0.85936,0.35318 0.8587,-0.16536 1.12154,0.0294 0.88198,0.65372 -0.18769,0.48911 -0.0318,0.88928 0.34645,0.88928 0.37824,0 0.68771,0.39937 0.68771,0.88748 0,0.48812 0.44649,1.33397 0.99219,1.87968 0.54571,0.54571 0.83411,1.40415 0.6409,1.90765 -0.30692,0.79985 -10.35806,0.91496 -79.59682,0.91152 l -79.24552,-0.004 0.0563,-26.08761 z m 156.53168,22.02163 c 0,-0.15067 -0.27956,-0.27395 -0.62124,-0.27395 -0.34168,0 -0.62124,0.29606 -0.62124,0.6579 0,0.36185 0.27956,0.48513 0.62124,0.27396 0.34168,-0.21117 0.62124,-0.50723 0.62124,-0.65791 z m -1.5531,-1.51642 c -0.21117,-0.34168 -0.50723,-0.62124 -0.6579,-0.62124 -0.15068,0 -0.27396,0.27956 -0.27396,0.62124 0,0.34168 0.29606,0.62123 0.65791,0.62123 0.36184,0 0.48512,-0.27955 0.27395,-0.62123 z m -2.73108,-5.15392 c -0.79736,-0.79735 -1.60593,-0.18109 -1.01563,0.77405 0.22867,0.36999 0.70035,0.49681 1.0482,0.28183 0.4243,-0.26223 0.41359,-0.60972 -0.0325,-1.05588 z m 3.35232,0.80525 c -0.21117,-0.34168 -0.64701,-0.62124 -0.96852,-0.62124 -0.32152,0 -0.58458,0.27956 -0.58458,0.62124 0,0.34168 0.43584,0.62124 0.96853,0.62124 0.53268,0 0.79574,-0.27956 0.58457,-0.62124 z m -44.47026,-2.0395 c -0.14237,-0.0967 -0.81796,-0.58591 -1.50132,-1.08717 -1.1493,-0.84302 -1.17854,-0.82984 -0.38987,0.17579 0.46894,0.59795 1.14454,1.08717 1.50133,1.08717 0.35679,0 0.53222,-0.0791 0.38986,-0.17579 z m 36.08355,-7.9003 c 0,-0.34168 -0.27956,-0.62124 -0.62124,-0.62124 -0.34168,0 -0.62123,0.27956 -0.62123,0.62124 0,0.34168 0.27955,0.62124 0.62123,0.62124 0.34168,0 0.62124,-0.27956 0.62124,-0.62124 z m -1.86371,-1.27914 c 0,-0.36185 -0.27956,-0.48512 -0.62124,-0.27395 -0.34168,0.21117 -0.62124,0.50722 -0.62124,0.6579 0,0.15067 0.27956,0.27395 0.62124,0.27395 0.34168,0 0.62124,-0.29605 0.62124,-0.6579 z m -1.43356,-2.49064 c -0.18479,-0.70667 -0.0573,-2.08417 0.28323,-3.06113 0.51531,-1.4782 0.40315,-1.99236 -0.66832,-3.06383 -1.27252,-1.27251 -1.28754,-1.27304 -1.28754,-0.045 0,0.71117 0.41416,1.24248 0.96852,1.24248 0.53269,0 0.81892,0.24206 0.63606,0.53792 -0.58689,0.94961 -3.39037,0.005 -3.58902,-1.20904 -0.14296,-0.87383 -0.42022,-1.01112 -1.12175,-0.55542 -0.7726,0.50185 -0.78781,0.6982 -0.089,1.14888 0.51241,0.33047 0.60089,0.69314 0.2257,0.92502 -0.81959,0.50654 -2.22231,-1.22824 -1.68981,-2.08984 0.22967,-0.37161 0.0538,-1.11402 -0.39088,-1.6498 -0.44466,-0.53578 -0.72899,-1.89663 -0.63185,-3.02411 0.12434,-1.44331 -0.15781,-2.25884 -0.95342,-2.75574 -1.01586,-0.63445 -0.99186,-0.66812 0.23752,-0.33321 1.15591,0.3149 1.56452,-0.0598 2.64026,-2.4212 0.69998,-1.53657 1.2727,-3.10254 1.2727,-3.47993 0,-0.37739 0.41831,-1.4951 0.92958,-2.48378 0.65848,-1.27335 0.72881,-1.92169 0.24116,-2.22307 -0.37863,-0.23401 -0.8742,-0.12485 -1.10129,0.24257 -0.2843,0.46001 -0.69793,0.47007 -1.32832,0.0323 -0.71646,-0.49755 -0.74102,-0.70612 -0.11298,-0.95948 0.65581,-0.26457 0.65581,-0.50147 0,-1.29621 -0.59844,-0.7252 -0.61648,-1.0351 -0.071,-1.21882 0.45085,-0.15183 0.63284,-1.1261 0.47432,-2.53924 -0.17514,-1.56133 0.0707,-1.10438 0.77057,1.43225 0.56527,2.04882 1.15445,3.34508 1.30928,2.88059 0.22219,-0.66656 0.38355,-0.67945 0.76565,-0.0612 0.26628,0.43084 0.37335,-0.86542 0.23795,-2.88059 -0.14926,-2.22126 -0.0332,-3.33206 0.29486,-2.82106 0.37729,0.58776 0.66967,0.63477 0.966,0.15531 0.23371,-0.37816 0.15999,-0.68756 -0.16383,-0.68756 -0.32382,0 -0.78313,-1.04834 -1.02068,-2.32964 -0.46953,-2.53248 -2.56818,-6.36769 -3.48445,-6.36769 -0.31382,0 -0.60051,0.629 -0.6371,1.39778 -0.0366,0.76879 -0.35982,0.13978 -0.71829,-1.39778 -0.59299,-2.54351 -0.69344,-2.65554 -1.11402,-1.24248 -0.4411,1.482 -0.4651,1.48912 -0.52419,0.15531 -0.034,-0.76878 -0.33271,-1.39778 -0.66367,-1.39778 -0.33095,0 -0.51655,-0.34945 -0.41243,-0.77655 0.10412,-0.4271 0.072,-0.56688 -0.0713,-0.31062 -0.51411,0.9193 -1.7492,0.40191 -4.10456,-1.71943 -1.31694,-1.1861 -2.6436,-2.00254 -2.94813,-1.81433 -0.30454,0.18821 -1.18394,-0.31982 -1.95423,-1.12895 -0.86792,-0.91169 -2.81803,-1.78863 -5.12796,-2.30599 -3.81055,-0.85347 -20.19022,-8.47387 -20.19022,-9.39321 0,-0.27968 -0.96559,-0.96672 -2.14575,-1.52675 -1.18017,-0.56003 -2.47241,-1.41181 -2.87164,-1.89285 -0.39923,-0.48106 -1.04395,-0.87465 -1.43271,-0.87465 -0.38875,0 -1.44245,-0.68211 -2.34155,-1.51579 -0.89909,-0.83369 -2.69073,-2.0818 -3.98143,-2.77356 -1.29069,-0.69178 -2.5091,-1.51007 -2.70759,-1.81844 -0.40596,-0.63071 -7.24475,-5.07449 -7.80941,-5.07449 -0.20019,0 -0.30991,0.62901 -0.24384,1.39779 0.19417,2.25935 -0.0344,3.57211 -0.62189,3.57211 -0.30183,0 -0.67812,-0.49458 -0.83619,-1.09906 -0.17132,-0.65513 -0.96104,-1.15481 -1.95514,-1.23708 -1.46951,-0.12162 -1.59144,0.004 -1.02585,1.06136 0.42715,0.79812 0.4335,1.32818 0.019,1.58437 -0.3426,0.21174 -0.62291,0.80431 -0.62291,1.31683 0,0.55328 0.29527,0.74937 0.72681,0.48267 0.50823,-0.31411 0.58856,-0.0916 0.26711,0.73988 -0.25284,0.65399 -0.61393,1.95332 -0.80244,2.8874 -0.18852,0.93407 -0.55079,1.56975 -0.80504,1.41261 -0.25426,-0.15714 -0.33367,-0.9585 -0.17648,-1.78081 0.15719,-0.8223 -0.0201,-1.68415 -0.39393,-1.9152 -0.37386,-0.23106 -0.68402,-1.03261 -0.68925,-1.78123 -0.008,-1.08544 -0.12705,-1.17526 -0.58981,-0.44345 -0.38759,0.61292 -0.29934,1.23185 0.26572,1.86371 0.46531,0.52033 0.77158,1.86035 0.68058,2.97784 -0.20976,2.57642 -0.9682,3.41803 -0.9682,1.0744 0,-2.17622 -0.43874,-1.84596 -0.84022,0.63245 -0.16504,1.01888 -0.35401,1.99228 -0.41993,2.16312 -0.0659,0.17084 -0.067,0.95442 -0.002,1.74129 0.0647,0.78688 -0.21519,1.83158 -0.62184,2.32157 -0.43015,0.5183 -0.57257,1.60878 -0.34052,2.60737 0.29558,1.27203 0.23559,1.47519 -0.23173,0.78462 -0.60272,-0.89065 -0.70667,-0.81482 -0.88259,0.64389 -0.11995,0.99458 -1.82515,1.84882 -2.97625,1.49098 -0.56919,-0.17693 -1.21751,-0.0262 -1.44071,0.33494 -0.22304,0.36115 -0.64659,0.50774 -0.94105,0.32576 -1.357,-0.83868 -1.05027,1.01076 0.52928,3.19126 2.05626,2.8386 10.50454,11.40251 14.31802,14.51401 1.46568,1.19588 6.12909,5.60161 10.36314,9.79051 l 7.69825,7.61618 2.49186,-2.25124 c 1.37052,-1.23818 3.97046,-3.01839 5.77765,-3.95602 4.94349,-2.56484 6.21753,-3.32402 7.70143,-4.58917 0.75271,-0.64175 3.79006,-1.6439 6.83361,-2.2547 3.01327,-0.60472 6.79048,-1.83211 8.39379,-2.72753 1.60332,-0.89542 3.4561,-1.62803 4.11729,-1.62803 0.66119,0 1.52742,-0.39191 1.92495,-0.87091 0.39753,-0.47899 1.37938,-1.03569 2.18188,-1.23711 2.10975,-0.52951 2.4876,-2.13301 0.82103,-3.48421 -0.76958,-0.62394 -1.20058,-1.33386 -0.95778,-1.57759 0.2428,-0.24374 2.15201,1.29416 4.24268,3.41754 2.09068,2.12339 3.64601,4.01593 3.45629,4.20564 -0.1897,0.18971 -0.77101,-0.009 -1.29179,-0.4409 -0.53176,-0.44132 -0.94687,-0.51104 -0.94687,-0.15904 0,0.34474 -0.83867,0.74989 -1.86372,0.90033 -1.27179,0.18666 -1.86371,0.0117 -1.86371,-0.55072 0,-0.45335 -0.27078,-0.82427 -0.60174,-0.82427 -0.33095,0 -0.42754,0.45395 -0.21464,1.00876 0.23142,0.60307 -0.0185,1.2357 -0.62122,1.57304 -0.73923,0.4137 -0.90655,1.0731 -0.62698,2.47093 0.2232,1.11597 0.10036,2.08029 -0.2962,2.32539 -0.45797,0.28303 -0.49984,1.20662 -0.12921,2.84993 0.30157,1.33716 0.40255,3.28699 0.22437,4.33297 -0.22007,1.29203 -0.13603,1.63663 0.26214,1.07478 0.42135,-0.59456 0.72286,-0.0707 1.07272,1.86371 0.26766,1.4799 0.43678,3.13538 0.37582,3.67885 -0.0609,0.54348 0.2252,1.80149 0.63592,2.79557 0.41072,0.99409 0.77343,1.94721 0.80601,2.11805 0.55056,2.88659 4.01023,7.38744 5.71525,7.43522 0.38526,0.0108 1.0485,0.43897 1.47385,0.95149 1.1163,1.34506 2.06436,1.14499 1.67263,-0.35298 z m -8.82634,-16.74639 c -0.25318,-0.40965 -0.0751,-0.98416 0.39581,-1.2767 1.03315,-0.64183 1.59008,0.49597 0.68553,1.40052 -0.41385,0.41385 -0.77456,0.37255 -1.08134,-0.12382 z m -2.73704,-6.4559 c -0.027,-0.65488 0.11984,-1.0218 0.32628,-0.81537 0.20643,0.20643 0.2285,0.74225 0.049,1.19071 -0.19831,0.49558 -0.34552,0.34837 -0.37533,-0.37534 z m 8.01058,-6.92867 c -0.43851,-1.15337 -0.38723,-1.8161 0.1848,-2.38813 0.64151,-0.64151 0.79175,-0.33858 0.79175,1.59638 0,2.8107 -0.15971,2.94019 -0.97655,0.79175 z m -9.57279,-12.50998 c -0.33713,-0.88539 -0.26577,-0.95674 0.34777,-0.34777 0.42457,0.42141 0.61544,0.92269 0.42417,1.11396 -0.19127,0.19128 -0.53864,-0.15351 -0.77194,-0.76619 z m -2.44723,-2.74471 c -1.43326,-1.67391 -0.93252,-2.17465 0.54358,-0.54358 0.62223,0.68755 1.00162,1.37979 0.84311,1.5383 -0.15852,0.15852 -0.78253,-0.2891 -1.38669,-0.99472 z m -0.38827,20.50518 c 0,-0.34169 -0.27956,-0.44847 -0.62124,-0.2373 -0.34168,0.21117 -0.62124,0.6635 -0.62124,1.00518 0,0.34168 0.27956,0.44847 0.62124,0.2373 0.34168,-0.21117 0.62124,-0.6635 0.62124,-1.00518 z m 2.54321,-5.70805 c -0.49184,-0.49184 -0.6795,-0.33064 -0.6795,0.58368 0,1.6424 0.86877,2.51417 1.14542,1.14939 0.11747,-0.57947 -0.0922,-1.35935 -0.46592,-1.73307 z m 25.67125,-7.66416 c 0.57074,-1.48729 0.12587,-1.60151 -0.75348,-0.19344 -0.41706,0.66782 -0.50628,1.21422 -0.19826,1.21422 0.30802,0 0.73631,-0.45935 0.95174,-1.02078 z m 1.98027,-5.02335 c -0.20643,-0.20643 -0.35326,0.16049 -0.32628,0.81538 0.0298,0.72371 0.17701,0.87091 0.37532,0.37533 0.17946,-0.44846 0.15739,-0.98428 -0.049,-1.19071 z m 1.64718,-4.98168 c -0.39063,-0.13021 -0.55625,-0.63802 -0.36805,-1.12846 0.1882,-0.49045 0.0359,-0.89172 -0.33856,-0.89172 -0.37441,0 -0.62548,0.66771 -0.55794,1.4838 0.0856,1.03458 0.40315,1.37622 1.0488,1.12846 0.57771,-0.22168 0.65886,-0.44437 0.21575,-0.59208 z m 1.3943,-3.26266 c -0.21117,-0.34168 -0.50723,-0.62123 -0.65791,-0.62123 -0.15067,0 -0.27395,0.27955 -0.27395,0.62123 0,0.34168 0.29606,0.62124 0.6579,0.62124 0.36185,0 0.48513,-0.27956 0.27396,-0.62124 z m -149.48943,-4.40043 c 0.045,0.82573 0.25513,1.32797 0.46701,1.1161 0.21187,-0.21188 0.19266,-1.15245 -0.0427,-2.09016 -0.33482,-1.33402 -0.55172,-1.50925 -0.99696,-0.80549 -0.31297,0.49471 -0.53652,1.73813 -0.49677,2.76318 0.0714,1.84264 0.0774,1.83912 0.52995,-0.31062 0.34452,-1.63677 0.47789,-1.80316 0.53947,-0.67301 z m 2.35693,-0.10354 c -0.17234,-0.4271 -0.31335,-0.0776 -0.31335,0.77655 0,0.8542 0.14101,1.20365 0.31335,0.77654 0.17233,-0.4271 0.17233,-1.12599 0,-1.55309 z m -4.13886,-0.90967 c 0,-1.55366 -0.079,-1.60718 -1.00536,-0.68085 -0.55296,0.55295 -0.81602,1.31175 -0.58458,1.68622 0.76239,1.23357 1.58994,0.71029 1.58994,-1.00537 z m 54.92776,0.0371 c 0.3132,0.0528 0.61606,-0.18357 0.67301,-0.52525 0.057,-0.34168 -0.008,-0.42728 -0.14368,-0.19021 -0.13597,0.23707 -0.64849,0.27704 -1.13894,0.0888 -0.49044,-0.1882 -1.38094,-0.14249 -1.97888,0.10159 -0.99643,0.40672 -0.98347,0.48296 0.15531,0.91352 0.68336,0.25837 1.38225,0.25506 1.55309,-0.007 0.17084,-0.26242 0.56688,-0.43393 0.88009,-0.38114 z m -3.99579,-3.20218 c -0.008,-0.90532 -0.0927,-0.92172 -0.61172,-0.11865 -0.78624,1.21661 -0.78624,2.03901 0,1.55309 0.34168,-0.21117 0.61695,-0.85667 0.61172,-1.43445 z m 106.24114,1.12382 c 0,-0.34168 -0.27955,-0.62124 -0.62123,-0.62124 -0.34168,0 -0.62124,0.27956 -0.62124,0.62124 0,0.34168 0.27956,0.62124 0.62124,0.62124 0.34168,0 0.62123,-0.27956 0.62123,-0.62124 z m -49.38839,-0.69697 c 0.68337,-0.0262 2.31205,-0.49122 3.6193,-1.03342 1.79855,-0.74597 2.48822,-0.80559 2.83464,-0.24506 0.31883,0.51588 1.10599,0.14588 2.59307,-1.2189 1.1744,-1.07781 1.65551,-1.79085 1.06915,-1.58455 -0.89742,0.31574 -1.00801,0.0845 -0.69889,-1.46105 0.23271,-1.16356 0.11122,-1.83614 -0.33167,-1.83614 -0.38439,0 -0.69889,0.55912 -0.69889,1.24248 0,0.68336 -0.27955,1.24247 -0.62124,1.24247 -0.34168,0 -0.62123,-0.36317 -0.62123,-0.80705 0,-0.44388 -0.951,-1.15095 -2.11334,-1.57125 -4.30425,-1.55644 -4.32372,-3.92525 -0.0389,-4.7291 2.33228,-0.43753 2.32127,-0.42646 1.79311,-1.80281 -0.25879,-0.67442 -0.93071,-0.84298 -2.40597,-0.60358 -1.12579,0.18269 -2.22677,0.0411 -2.44662,-0.31461 -0.64019,-1.03584 0.82325,-1.539 1.89328,-0.65096 0.82049,0.68095 1.13957,0.6077 2.00421,-0.46008 0.56559,-0.69848 1.38334,-1.15164 1.81721,-1.00701 0.43387,0.14462 1.493,-0.44119 2.35362,-1.30181 l 1.56475,-1.56474 -2.63051,0.19618 c -1.44678,0.10791 -3.76949,-0.2232 -5.16157,-0.73578 -1.39209,-0.51259 -3.92886,-1.03211 -5.63726,-1.15449 -1.70841,-0.12239 -4.6605,-0.39494 -6.5602,-0.60569 -2.72604,-0.30241 -3.62588,-0.17609 -4.26943,0.59934 -1.09647,1.32117 -2.06918,1.23699 -3.00405,-0.25997 -0.42676,-0.68336 -1.1929,-1.24248 -1.70253,-1.24248 -0.5096,0 -0.92657,-0.41933 -0.92657,-0.93185 0,-0.51253 0.41934,-0.93186 0.93186,-0.93186 0.51252,0 0.93186,-0.41934 0.93186,-0.93186 0,-0.51252 0.43065,-0.93185 0.95701,-0.93185 0.52635,0 1.79512,-0.61964 2.81948,-1.37698 1.54244,-1.14038 2.0669,-1.24931 3.05223,-0.63396 0.75136,0.46923 1.32834,0.51879 1.56585,0.1345 0.20684,-0.33468 1.19826,-0.60851 2.20313,-0.60851 1.28593,0 1.82705,-0.30451 1.82705,-1.02815 0,-0.95357 0.0817,-0.95419 1.12671,-0.009 0.90013,0.81461 1.29331,0.8652 1.95514,0.2516 0.67206,-0.62308 0.75622,-0.56284 0.44588,0.3191 -0.28037,0.79678 -0.0559,1.08716 0.84043,1.08716 0.67264,0 1.22726,-0.34944 1.23249,-0.77654 0.007,-0.53875 0.14928,-0.56676 0.46593,-0.0915 0.3053,0.45827 0.9443,0.22181 1.92994,-0.71415 l 1.47353,-1.39925 -1.38173,-0.73948 c -0.75995,-0.40671 -1.94884,-0.59117 -2.64197,-0.40991 -0.69314,0.18126 -1.63314,-0.0434 -2.08891,-0.49911 -0.69072,-0.69072 -0.53146,-0.95176 0.95678,-1.5682 2.24054,-0.92807 3.90575,-0.18696 6.67039,2.96866 1.94956,2.2253 1.99426,2.24028 3.26149,1.09345 0.70666,-0.63952 1.28912,-0.90977 1.29435,-0.60055 0.005,0.30922 0.23948,0.19971 0.52054,-0.24336 0.28105,-0.44307 1.46489,-1.28174 2.63074,-1.86371 2.28634,-1.14132 2.40167,-1.70574 1.23164,-6.02805 -0.36996,-1.36672 -0.96488,-4.69678 -1.32205,-7.40013 -0.35716,-2.70336 -0.8957,-5.37543 -1.19675,-5.93794 -0.30105,-0.56252 -0.7959,-2.87779 -1.09967,-5.14504 -0.54971,-4.1029 -0.54374,-4.12861 1.27046,-5.46991 1.57642,-1.16549 1.77551,-1.63881 1.47314,-3.50214 -0.29737,-1.83251 -0.21497,-2.04276 0.55135,-1.40677 0.63623,0.52805 0.90099,0.54287 0.90099,0.0505 0,-0.38352 0.40494,-0.69731 0.89985,-0.69731 0.49492,0 1.63174,-0.67829 2.52628,-1.50732 1.28693,-1.19269 2.1041,-1.44679 3.91474,-1.21728 7.13861,0.90486 6.63616,0.93527 5.33028,-0.32251 -0.64804,-0.62416 -1.58941,-1.73147 -2.09194,-2.46067 -0.50254,-0.72921 -1.4111,-1.32583 -2.01903,-1.32583 -0.60793,0 -1.10533,-0.41934 -1.10533,-0.93186 0,-0.51252 -0.41933,-0.93185 -0.93185,-0.93185 -0.51252,0 -0.93186,-0.38439 -0.93186,-0.85421 0,-0.51165 -0.66567,-0.8542 -1.65995,-0.8542 -0.91298,0 -1.96132,-0.40893 -2.32964,-0.90872 -0.36834,-0.49981 -1.03686,-0.78511 -1.48561,-0.634 -0.44875,0.1511 -1.14765,-0.14106 -1.5531,-0.64925 -0.73557,-0.92197 -5.63083,-1.87054 -6.28375,-1.21763 -0.18942,0.18942 -0.0331,0.71958 0.34752,1.17811 1.32813,1.60031 -2.03376,0.91956 -3.55268,-0.71939 -0.79164,-0.8542 -2.0257,-1.55309 -2.74234,-1.55309 -1.66111,0 -4.72322,1.57038 -5.13021,2.63099 -0.45304,1.18059 -3.56593,1.31819 -3.56593,0.15762 0,-1.23939 -0.59372,-1.16489 -2.1343,0.26781 -0.8781,0.81662 -1.81894,1.08806 -2.98368,0.86082 -0.93564,-0.18254 -1.54814,-0.57948 -1.36112,-0.88209 0.42939,-0.69476 -1.14766,-0.72484 -1.93867,-0.037 -0.3246,0.28227 -1.70841,0.83159 -3.07513,1.22072 -1.36672,0.38913 -3.04406,0.86563 -3.72742,1.05888 -2.62362,0.74196 -6.27598,7.76822 -4.03805,7.76822 0.34168,0 0.62124,-0.29606 0.62124,-0.6579 0,-0.36185 0.27956,-0.48513 0.62124,-0.27396 0.34168,0.21117 0.62123,0.13035 0.62123,-0.1796 0,-0.84368 4.26668,-2.51841 7.56075,-2.96771 2.17756,-0.29701 3.7814,-0.0665 6.42842,0.92386 1.93983,0.72579 4.54797,1.39821 5.79587,1.49427 4.04858,0.31166 6.83914,1.70512 7.26099,3.62577 0.49006,2.23121 -0.12851,3.32686 -1.31997,2.33803 -0.70902,-0.58843 -0.87655,-0.46845 -0.87655,0.62773 0,0.74537 0.26024,1.19438 0.57831,0.9978 0.65763,-0.40644 1.59942,0.79838 1.052,1.3458 -0.19679,0.1968 -0.77166,0.0143 -1.27747,-0.40543 -1.34996,-1.12037 -2.27778,-0.27698 -1.6145,1.46758 0.82689,2.1749 -1.07015,5.70604 -2.92687,5.44807 -1.04677,-0.14545 -1.30044,0.0475 -1.0207,0.77654 0.20474,0.53355 0.6219,0.97009 0.92703,0.97009 1.14345,0 0.49554,2.56219 -1.10101,4.35404 -1.10233,1.23717 -2.24442,1.85834 -3.41681,1.85834 -1.88937,0 -2.20846,-0.54654 -1.01554,-1.73947 0.57982,-0.57982 0.31187,-0.74548 -1.20581,-0.74548 -1.07321,0 -2.12407,-0.27956 -2.33524,-0.62124 -0.21117,-0.34168 0.17517,-0.62124 0.85853,-0.62124 1.47398,0 2.27805,-1.00199 1.16436,-1.45099 -0.42923,-0.17305 -0.16791,-0.3367 0.5807,-0.36368 1.74556,-0.0629 2.37575,-1.08918 1.3947,-2.27128 -0.67198,-0.80968 -0.93602,-0.76746 -2.11255,0.33783 -1.70043,1.59747 -3.45707,1.60668 -5.15265,0.027 -0.72977,-0.67988 -1.47725,-0.99282 -1.66105,-0.69541 -0.18381,0.29741 -1.03722,0.67513 -1.89647,0.83939 -2.42528,0.46362 -1.92559,-1.18577 0.76736,-2.53294 3.19172,-1.59668 5.69085,-1.98782 8.56265,-1.34013 2.97474,0.67092 3.39187,0.36553 1.61075,-1.17923 -0.74987,-0.65035 -1.28392,-1.52424 -1.18677,-1.94197 0.0971,-0.41773 -0.73321,-1.07736 -1.84525,-1.46583 -1.87866,-0.6563 -1.93774,-0.75886 -0.83413,-1.44808 1.78221,-1.11301 4.36405,-0.3672 7.01278,2.02577 2.51611,2.27314 2.98746,2.51293 2.98746,1.51973 0,-0.34168 -0.35304,-0.62124 -0.78454,-0.62124 -0.4315,0 -1.0605,-0.62214 -1.39779,-1.38254 -0.33728,-0.76039 -1.45191,-1.80873 -2.47695,-2.32964 -1.02504,-0.52091 -2.48511,-1.5823 -3.2446,-2.35865 -2.40135,-2.45469 -3.83681,-2.61412 -7.93647,-0.88146 -2.05075,0.86673 -4.16998,1.94689 -4.70941,2.40036 -1.23161,1.03538 -2.25049,1.0541 -2.60983,0.048 -0.16132,-0.45168 -0.50784,-0.54605 -0.82832,-0.22557 -0.32048,0.32049 -0.22611,0.66701 0.22557,0.82832 0.4271,0.15254 0.77655,0.5336 0.77655,0.84681 0,1.03216 -1.33363,0.59381 -2.52001,-0.82832 -0.8401,-1.00703 -1.17236,-1.13728 -1.18854,-0.46593 -0.0124,0.51252 -0.85766,1.49097 -1.87848,2.17434 -1.02081,0.68336 -2.27949,2.30015 -2.79705,3.59287 -0.51757,1.29271 -1.36103,2.51156 -1.87437,2.70854 -0.74632,0.28639 -0.90126,1.40334 -0.77327,5.57431 0.1275,4.15506 0.3359,5.14928 1.02448,4.88739 0.67588,-0.25706 0.70742,-0.13959 0.14459,0.53858 -0.3959,0.47703 -0.59942,1.25221 -0.45225,1.72262 0.8648,2.76425 0.91762,4.89333 0.1214,4.89333 -0.46412,0 -0.99008,0.55912 -1.16878,1.24248 -0.40071,1.53232 -1.48888,1.62175 -1.88995,0.15531 -0.16353,-0.59794 -0.20645,0.29796 -0.0954,1.99088 0.12424,1.89334 -0.15725,3.77274 -0.73138,4.88297 -0.64608,1.24939 -0.69386,1.6569 -0.15524,1.32401 0.54406,-0.33624 0.66087,-0.17535 0.38833,0.53489 -0.38831,1.01191 0.68888,2.53876 2.18658,3.09931 0.58456,0.2188 0.52137,0.5134 -0.24513,1.14264 -0.58283,0.47847 -0.95569,1.52446 -0.85583,2.40093 0.0973,0.8542 0.21689,2.39176 0.26574,3.41681 0.0671,1.40847 0.23005,1.64034 0.6671,0.94927 0.49091,-0.77627 0.64397,-0.74333 1.01286,0.218 0.26589,0.69289 0.098,1.36505 -0.4325,1.73169 -0.62398,0.43124 -0.47629,0.48935 0.5268,0.2073 1.00095,-0.28145 1.30813,-0.16159 1.0897,0.42523 -0.17672,0.47476 0.98099,1.72826 2.76289,2.9915 2.29264,1.62531 2.99933,2.48806 2.79877,3.41681 -0.14756,0.68336 -0.1021,0.87594 0.10102,0.42795 0.2981,-0.65747 0.5665,-0.63989 1.39205,0.0912 0.5625,0.49814 1.55868,1.00445 2.21373,1.12514 0.65505,0.1207 1.30741,0.56909 1.44969,0.99642 0.17478,0.5249 -0.11083,0.63833 -0.88037,0.34961 -1.00551,-0.37724 -1.03842,-0.30363 -0.28074,0.62771 0.70676,0.86875 0.98101,0.90862 1.55309,0.22578 0.54878,-0.65504 1.12222,-0.68148 2.7292,-0.12584 1.11894,0.38689 1.81783,0.94156 1.5531,1.2326 -0.26474,0.29105 -0.11429,0.31719 0.33434,0.0581 0.90896,-0.52494 3.22235,1.24956 3.22235,2.47171 0,1.63805 8.56401,4.75285 11.80352,4.29304 1.19588,-0.16975 2.73344,-0.33005 3.4168,-0.35623 z m -2.45155,-14.56737 c -0.9383,-0.69261 -1.04265,-1.05893 -0.46593,-1.63565 0.92337,-0.92338 2.20725,0.14528 1.88858,1.57199 -0.18714,0.83781 -0.36322,0.84569 -1.42265,0.0637 z m 2.14094,-1.50907 c 0,-0.68337 0.27955,-1.24248 0.62123,-1.24248 0.34168,0 0.62124,0.55911 0.62124,1.24248 0,0.68336 -0.27956,1.24247 -0.62124,1.24247 -0.34168,0 -0.62123,-0.55911 -0.62123,-1.24247 z m -27.90665,-3.36504 c -0.027,-0.65489 0.11985,-1.02181 0.32629,-0.81538 0.20643,0.20643 0.22849,0.74225 0.049,1.19071 -0.19831,0.49558 -0.34552,0.34838 -0.37533,-0.37533 z m 10.059,-12.54124 c 0.20644,-0.20643 0.74225,-0.2285 1.19071,-0.049 0.49558,0.19831 0.34838,0.34552 -0.37533,0.37532 -0.65488,0.027 -1.02181,-0.11985 -0.81538,-0.32628 z m -2.03196,-2.38357 c 0,-0.53268 0.27956,-0.96852 0.62124,-0.96852 0.34168,0 0.62124,0.26306 0.62124,0.58457 0,0.32152 -0.27956,0.75735 -0.62124,0.96852 -0.34168,0.21117 -0.62124,-0.0519 -0.62124,-0.58457 z m 8.80793,-0.77344 c 0.11937,-0.61981 0.57285,-1.12694 1.00773,-1.12694 0.43489,0 0.99017,-0.29543 1.23397,-0.6565 0.24379,-0.36108 1.42172,-1.0523 2.6176,-1.53604 1.19588,-0.48374 2.80333,-1.55703 3.57212,-2.38508 1.61445,-1.73894 1.87243,-0.76236 0.39448,1.49329 -0.60217,0.91902 -1.5957,1.53124 -2.48496,1.53124 -0.8149,0 -1.48164,0.27387 -1.48164,0.60861 0,0.33474 -1.14217,1.19131 -2.53816,1.90349 -2.3698,1.20898 -2.52377,1.22011 -2.32114,0.16793 z m -22.26078,-9.22982 c -0.20233,-0.52726 -0.22906,-1.09746 -0.0594,-1.26711 0.16965,-0.16966 0.45758,0.26173 0.63983,0.95865 0.38712,1.48036 -0.043,1.70895 -0.58043,0.30846 z m 9.8663,-15.25617 c -1.22153,-0.45777 -1.30959,-0.69356 -0.6522,-1.74621 0.418,-0.66933 0.98361,-1.07877 1.2569,-0.90987 0.2733,0.1689 0.4969,0.0111 0.4969,-0.3508 0,-0.36185 0.54262,-0.6579 1.20581,-0.6579 0.6632,0 1.38141,-0.28412 1.59602,-0.63137 0.21462,-0.34726 0.65045,-0.47054 0.96852,-0.27396 0.31807,0.19658 0.57831,0.094 0.57831,-0.22803 0,-0.32199 0.48923,-0.75801 1.08717,-0.96892 0.59794,-0.21091 1.43661,-0.54637 1.86371,-0.74546 0.4271,-0.1991 0.77655,-0.11091 0.77655,0.19595 0,0.30688 -0.97845,1.02454 -2.17433,1.59482 -1.19588,0.57028 -2.17433,1.44169 -2.17433,1.93647 0,1.5368 -3.21394,3.39053 -4.82903,2.78528 z m -2.62582,-2.38564 c 0,-0.36185 0.27955,-0.65791 0.62123,-0.65791 0.34168,0 0.62124,0.12328 0.62124,0.27396 0,0.15067 -0.27956,0.44673 -0.62124,0.6579 -0.34168,0.21117 -0.62123,0.0879 -0.62123,-0.27395 z m 34.47868,-5.62781 c -0.21117,-0.34168 0.0519,-0.62123 0.58458,-0.62123 0.53268,0 0.96852,0.27955 0.96852,0.62123 0,0.34168 -0.26306,0.62124 -0.58457,0.62124 -0.32152,0 -0.75736,-0.27956 -0.96853,-0.62124 z m 38.82735,63.95081 c 0,-0.36184 -0.27955,-0.48512 -0.62123,-0.27395 -0.34168,0.21117 -0.62124,0.50723 -0.62124,0.6579 0,0.15068 0.27956,0.27396 0.62124,0.27396 0.34168,0 0.62123,-0.29606 0.62123,-0.65791 z m -97.5343,-2.13766 c 0,-0.91115 -0.35663,-1.5531 -0.86283,-1.5531 -0.97188,0 -1.02253,1.93022 -0.069,2.63075 0.90148,0.6623 0.93186,0.62717 0.93186,-1.07765 z m 62.00378,-3.74387 c -0.19127,-0.19127 -0.53864,0.15352 -0.77194,0.76619 -0.33713,0.88539 -0.26577,0.95675 0.34777,0.34777 0.42457,-0.42141 0.61544,-0.92268 0.42417,-1.11396 z m 32.79967,-2.61088 c -0.20643,-0.20643 -0.35326,0.16049 -0.32629,0.81538 0.0298,0.72371 0.17702,0.87091 0.37533,0.37533 0.17946,-0.44846 0.15739,-0.98428 -0.049,-1.19071 z m -91.41918,-1.44667 c -0.60054,-0.66359 -1.39801,-1.20225 -1.77215,-1.19702 -0.48999,0.007 -0.48907,0.13718 0.003,0.46593 0.37595,0.25103 1.05179,1.15456 1.50187,2.00786 0.51859,0.98318 0.91733,1.25444 1.08861,0.7406 0.14865,-0.44597 -0.22107,-1.35378 -0.82161,-2.01737 z m 64.64125,0.036 c -0.28722,-1.30769 -0.17385,-1.86371 0.37999,-1.86371 0.44914,0 0.2696,-0.39311 -0.41656,-0.9121 -1.57989,-1.19497 -2.13776,-1.17747 -2.13776,0.0671 0,0.56027 -0.46205,1.35653 -1.02677,1.76946 -1.42497,1.04197 -0.48703,2.27353 1.37546,1.80607 0.92334,-0.23174 1.51502,-0.11133 1.51502,0.30834 0,0.37872 0.16199,0.68858 0.35998,0.68858 0.19799,0 0.17577,-0.83867 -0.0494,-1.86371 z m -110.26968,-2.99035 c 0,-0.78015 -0.18193,-0.734 -0.9121,0.23137 -1.19331,1.57769 -1.20533,2.50046 -0.0198,1.51653 0.51252,-0.42536 0.93185,-1.21191 0.93185,-1.7479 z m 46.59282,1.51334 c 0,-0.129 -0.48922,-0.61822 -1.08716,-1.08716 -0.98532,-0.77274 -1.0073,-0.75077 -0.23456,0.23455 0.81157,1.03483 1.32172,1.36391 1.32172,0.85261 z m -40.85375,-4.858 c -0.33928,-1.29738 -0.37809,-1.30492 -0.7958,-0.1547 -0.49233,1.35567 -0.15793,2.32846 0.63247,1.83997 0.286,-0.17676 0.35949,-0.93513 0.16333,-1.68527 z m 98.62885,-3.07636 c 0,-0.2776 -0.76878,-0.66692 -1.7084,-0.86515 -0.93963,-0.19822 -2.61333,-0.7564 -3.71933,-1.2404 -2.03023,-0.88843 -5.75455,-0.62159 -5.75455,0.41232 0,0.29897 -0.83867,0.54358 -1.86371,0.54358 -1.02504,0 -1.86371,0.26912 -1.86371,0.59803 0,0.35701 1.65489,0.46174 4.10607,0.25987 2.71394,-0.22352 3.97327,-0.12328 3.71436,0.29564 -0.73338,1.18665 1.52919,1.77317 4.35005,1.12767 1.50657,-0.34475 2.73922,-0.85396 2.73922,-1.13156 z m 10.54858,-0.85404 c -0.43221,-0.52078 -0.91377,-0.81894 -1.07013,-0.66257 -0.43083,0.43082 0.44452,1.60944 1.19532,1.60944 0.41194,0 0.36481,-0.35646 -0.12519,-0.94687 z m -109.9466,-0.64289 c 0,-0.53269 -0.28412,-0.79293 -0.63137,-0.57831 -0.34725,0.21461 -0.47054,0.65045 -0.27396,0.96852 0.53255,0.86168 0.90533,0.70101 0.90533,-0.39021 z m 48.45654,-2.17433 c 0,-0.36185 -0.27956,-0.48513 -0.62124,-0.27396 -0.34168,0.21117 -0.62124,0.50723 -0.62124,0.65791 0,0.15067 0.27956,0.27395 0.62124,0.27395 0.34168,0 0.62124,-0.29606 0.62124,-0.6579 z m -1.86372,-1.51643 c 0,-0.51252 -0.27078,-0.93186 -0.60174,-0.93186 -0.33095,0 -0.44082,0.41934 -0.24415,0.93186 0.19667,0.51252 0.46745,0.93185 0.60174,0.93185 0.13428,0 0.24415,-0.41933 0.24415,-0.93185 z m 65.95794,-7.29954 c 0.75596,-1.45215 1.43278,-2.91982 1.50403,-3.2615 0.0713,-0.34168 0.46766,-1.45991 0.8809,-2.48495 0.69073,-1.71337 0.79242,-1.76349 1.2605,-0.62124 0.86267,2.10513 0.62978,0.14794 -0.29568,-2.48495 -0.58164,-1.65473 -0.99641,-2.17234 -1.24146,-1.54928 -0.27139,0.69006 -1.09961,0.87748 -3.15523,0.71399 -1.53298,-0.12192 -2.78724,-0.48958 -2.78724,-0.81702 0,-0.32744 0.26025,-0.43451 0.57831,-0.23794 0.94725,0.58543 1.4536,-0.88598 0.64159,-1.86439 -0.52877,-0.63712 -0.54459,-0.90464 -0.0535,-0.90464 0.38351,0 0.6973,-0.38943 0.6973,-0.86539 0,-0.47597 0.41934,-1.02631 0.93186,-1.22298 1.08095,-0.4148 1.23964,-1.99675 0.26097,-2.6016 -0.36899,-0.22805 -1.08373,0.17479 -1.58832,0.89519 -1.17102,1.67187 -3.32808,1.67393 -5.11958,0.005 -1.79429,-1.67164 -2.07758,-1.32868 -1.56261,1.89176 0.31454,1.96702 0.78222,2.75473 1.88432,3.17375 1.72403,0.65548 1.79655,1.08209 0.49885,2.93482 -0.53189,0.75938 -0.80162,1.3807 -0.59938,1.3807 0.20224,0 0.0848,0.52851 -0.26086,1.17448 -0.45159,0.84381 -0.3455,2.0244 0.37681,4.19335 1.43191,4.29969 1.53941,4.40291 5.32063,5.10861 0.24931,0.0465 1.07181,-1.10351 1.82777,-2.55566 z m -63.68279,-1.24248 c -0.17234,-0.4271 -0.31335,-0.0777 -0.31335,0.77655 0,0.8542 0.14101,1.20364 0.31335,0.77654 0.17234,-0.4271 0.17234,-1.12599 0,-1.55309 z m -0.62124,-5.59114 c -0.17234,-0.4271 -0.31334,-0.0777 -0.31334,0.77655 0,0.8542 0.141,1.20365 0.31334,0.77655 0.17234,-0.42711 0.17234,-1.126 0,-1.5531 z m -36.44321,-0.15531 c 0,-0.51252 -0.10988,-0.93185 -0.24416,-0.93185 -0.13428,0 -0.40506,0.41933 -0.60174,0.93185 -0.19667,0.51252 -0.0868,0.93186 0.24415,0.93186 0.33096,0 0.60175,-0.41934 0.60175,-0.93186 z m 2.96835,-0.9932 c -0.0434,-1.5244 -0.17481,-1.71049 -0.63168,-0.89412 -0.31731,0.56701 -0.42254,1.43328 -0.23383,1.92506 0.55987,1.459 0.92397,1.02531 0.86551,-1.03094 z m 3.46868,-4.59794 c 0.19667,-0.51252 0.0868,-0.93185 -0.24416,-0.93185 -0.33095,0 -0.60173,0.41933 -0.60173,0.93185 0,0.51252 0.10986,0.93186 0.24415,0.93186 0.13428,0 0.40506,-0.41934 0.60174,-0.93186 z m 99.54869,-0.7636 c -0.20643,-0.20643 -0.35326,0.16049 -0.32628,0.81537 0.0298,0.72371 0.17701,0.87091 0.37532,0.37533 0.17946,-0.44845 0.1574,-0.98427 -0.049,-1.1907 z m -93.78937,-2.03197 c 0.50763,0 0.75019,-0.27955 0.53902,-0.62123 -0.8167,-1.32145 -2.17425,-0.6194 -2.10227,1.08716 0.0444,1.05107 0.18138,1.2901 0.35617,0.62124 0.15626,-0.59794 0.69944,-1.08717 1.20708,-1.08717 z m 88.44414,-6.90629 c 0,-0.88578 -1.75345,-1.8508 -2.16195,-1.18983 -0.22487,0.36385 -0.65624,0.50865 -0.95859,0.32178 -0.68564,-0.42374 -3.71307,0.29913 -3.71307,0.88658 0,0.23783 1.53756,0.42014 3.4168,0.40514 1.87925,-0.015 3.41681,-0.20564 3.41681,-0.42367 z m 8.22852,-6.3322 c -0.14944,-0.27671 -0.65532,0.003 -1.12417,0.62123 -1.23777,1.63255 -1.08093,2.23578 0.25195,0.96903 0.62917,-0.59794 1.02167,-1.31356 0.87222,-1.59026 z m 0.77943,2.05619 c -0.21118,-0.34168 -0.50723,-0.62124 -0.65791,-0.62124 -0.15067,0 -0.27395,0.27956 -0.27395,0.62124 0,0.34168 0.29606,0.62124 0.6579,0.62124 0.36185,0 0.48513,-0.27956 0.27396,-0.62124 z m -33.31767,-2.69742 c 0.38055,-0.45853 0.50796,-1.01765 0.28314,-1.24247 -0.78473,-0.78474 -2.02675,-0.39932 -2.68664,0.8337 -0.55722,1.04119 -0.47244,1.24248 0.52331,1.24248 0.65355,0 1.49964,-0.37517 1.88019,-0.83371 z M 210.30966,262.0123 c -0.2776,1.48343 -0.0964,1.3065 0.88809,-0.8671 0.68027,-1.50195 1.11525,-2.85242 0.96661,-3.00106 -0.47952,-0.47952 -4.10452,3.70824 -4.10029,4.73685 0.002,0.63753 0.46942,0.32542 1.29923,-0.86869 l 1.29513,-1.86371 z m 14.03139,0.65713 c 1.17939,-0.49278 2.54143,-1.37691 3.02675,-1.96474 0.7684,-0.9307 0.76202,-1.01564 -0.0495,-0.65752 -0.51252,0.22618 -1.42108,0.58381 -2.01902,0.79472 -0.59794,0.21091 -1.08717,0.64692 -1.08717,0.96892 0,0.32199 -0.25433,0.42826 -0.56518,0.23614 -0.80278,-0.49614 -2.60275,0.29472 -2.19016,0.9623 0.43745,0.70781 0.35315,0.71774 2.88424,-0.33982 z m -24.60418,-4.81816 c 1.01161,-1.95624 1.06738,-2.36196 0.32467,-2.36196 -0.29897,0 -0.71818,0.873 -0.93158,1.94001 -0.31664,1.58318 -0.54927,1.80616 -1.26482,1.2123 -0.53958,-0.4478 -1.01905,-0.49756 -1.24662,-0.12935 -0.20339,0.32909 -0.0186,0.71654 0.41062,0.861 0.60059,0.20212 0.56816,0.53644 -0.14074,1.45084 -0.8455,1.09062 -0.80201,1.08628 0.52953,-0.0528 0.79788,-0.68256 1.8414,-1.99657 2.31894,-2.92004 z m 2.95663,1.05485 c 0.19667,-0.51252 0.0868,-0.93186 -0.24416,-0.93186 -0.33095,0 -0.60174,0.41934 -0.60174,0.93186 0,0.51252 0.10987,0.93185 0.24415,0.93185 0.13429,0 0.40507,-0.41933 0.60175,-0.93185 z m 3.76901,-0.0444 c 0.53693,-0.53692 0.97623,-1.42831 0.97623,-1.98085 0,-0.81567 -0.23369,-0.75379 -1.24248,0.32902 -1.90452,2.04426 -1.65768,3.57575 0.26625,1.65183 z m 3.46118,-1.51612 c 0,-1.31879 -1.55014,-0.2261 -1.76482,1.24402 -0.19357,1.3256 -0.12699,1.36517 0.77655,0.46164 0.54354,-0.54355 0.98827,-1.3111 0.98827,-1.70566 z m -13.40999,-0.76915 1.66482,-2.64026 -1.89288,2.15087 c -1.68415,1.91367 -2.33099,3.12965 -1.66483,3.12965 0.12544,0 0.97724,-1.18811 1.89289,-2.64026 z m 68.0789,-18.48181 c 0,-0.34169 -0.29606,-0.62124 -0.6579,-0.62124 -0.36185,0 -0.48513,0.27955 -0.27396,0.62124 0.21117,0.34168 0.50723,0.62123 0.65791,0.62123 0.15067,0 0.27395,-0.27955 0.27395,-0.62123 z m -1.24248,-1.86372 c 0,-0.34168 -0.29605,-0.62124 -0.6579,-0.62124 -0.36184,0 -0.48512,0.27956 -0.27395,0.62124 0.21117,0.34168 0.50723,0.62124 0.6579,0.62124 0.15068,0 0.27395,-0.27956 0.27395,-0.62124 z m 21.34684,187.62652 c -0.0357,-1.35971 0.17875,-2.32166 0.47645,-2.13766 0.66651,0.41192 0.72555,4.60985 0.0648,4.60985 -0.26204,0 -0.50562,-1.11248 -0.54127,-2.47219 z m 1.83487,1.27838 c 0.0631,-0.82744 0.53404,-1.6175 1.04656,-1.7557 0.61571,-0.16602 0.69279,-0.0772 0.22718,0.26196 -0.38758,0.28227 -0.85853,1.07234 -1.04657,1.7557 -0.26958,0.97969 -0.31762,0.92429 -0.22717,-0.26196 z m 1.09561,0.31372 c -0.027,-0.65488 0.11985,-1.0218 0.32628,-0.81537 0.20644,0.20643 0.2285,0.74225 0.049,1.19071 -0.19831,0.49558 -0.34552,0.34838 -0.37533,-0.37534 z m -4.34867,-3.10618 c -0.027,-0.65489 0.11985,-1.02181 0.32629,-0.81538 0.20643,0.20643 0.2285,0.74225 0.049,1.19071 -0.19831,0.49558 -0.34552,0.34838 -0.37533,-0.37533 z m 0.5722,-2.2261 c 0.88102,-1.01691 1.74995,-0.44768 2.17433,0 -0.21117,0.34168 -0.78679,0.62123 -1.27914,0.62123 -0.49236,0 -0.89519,-0.27955 -0.89519,-0.62123 z m 0,-4.34867 c -133.89484,177.35439 -66.94742,88.6772 0,0 z m -7.51388,-2.95088 c -1.30923,-1.63073 -2.49041,-3.88273 -2.0365,-3.88273 0.74351,0 3.338,3.16348 3.338,4.07005 0,1.16915 -0.24022,1.13458 -1.3015,-0.18732 z m -2.11531,-31.21719 c 0.21117,-0.34168 0.64701,-0.62123 0.96852,-0.62123 0.32152,0 0.58458,0.27955 0.58458,0.62123 0,0.34169 -0.43584,0.62124 -0.96853,0.62124 -0.53268,0 -0.79574,-0.27955 -0.58457,-0.62124 z m 1.20591,-2.81532 c 1.57624,-1.19222 2.56548,-1.17793 1.36779,0.0198 -0.51252,0.51252 -1.30127,0.92296 -1.75278,0.9121 -0.51506,-0.0124 -0.37162,-0.35959 0.38499,-0.93186 z m -6.48643,-0.84563 c 0,-0.30513 0.41934,-0.71569 0.93186,-0.91237 0.56763,-0.21782 0.93186,-10e-4 0.93186,0.55477 0,0.5018 -0.41934,0.91237 -0.93186,0.91237 -0.51252,0 -0.93186,-0.24965 -0.93186,-0.55477 z M 125.2377,370.65858 c 0.18183,-0.47385 0.72003,-0.86155 1.196,-0.86155 1.2912,0 1.04491,1.05062 -0.3306,1.41032 -0.83902,0.21941 -1.09732,0.0556 -0.8654,-0.54877 z m 7.65252,-6.45269 c 0,-0.34168 0.43584,-0.62123 0.96853,-0.62123 0.53268,0 0.79574,0.27955 0.58457,0.62123 -0.21117,0.34168 -0.64701,0.62124 -0.96852,0.62124 -0.32152,0 -0.58458,-0.27956 -0.58458,-0.62124 z m 154.06693,-84.48831 c 0,-0.34168 0.12328,-0.62124 0.27396,-0.62124 0.15067,0 0.44673,0.27956 0.6579,0.62124 0.21117,0.34168 0.0879,0.62123 -0.27395,0.62123 -0.36185,0 -0.65791,-0.27955 -0.65791,-0.62123 z"
- id="path3888"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccsscscscscssssscssscssscsssscsscscsssssssssssssscscscssscssssscscscssscsssssscccscssssccccssssccsssssscscscccsssscsssscsssssssscssssssssssscsssscssssscssscsssscccssscssssssssssssssssscssssscccssssscccssssssssssccsccssssscssscssssssssssccssscccssscssssssccssscsssssccssscsscsscscsssscssccsssssccscsccsccsscssccsssscccssscssssssssscsccssssscscscsscscssccsssscccccsssscscccsscssssssscscsscccscccsscccsssssscscccscsccsssscccccscccccsccssssscssssssssssscscsscscssssssssssssscsscsssccscsscsssccssssssscsssssssssssscsscsssssscssssssssssssssccsccsssssssssssscssssccsssssssscsccsscsscssssssscscscscccssssscsscccssssssscccssccsssssccccccccccssssssscsssssssscsssscsssssscssssssssssssssssssscssccccsccsscccccsccccssssssscccssccsssscsscscssssssssscssscssssssssssssccssscssssssssscsssscscccsssssssssscssccsccsssccccccsscsssscsssccsccssscsssssssscscscscsscsccssscscssscssscsssssscsscssssscsssssssccscccscscccccccccccccscccsssscsssccccccscssscsscssssssssss" />
- </g>
-</svg>
diff --git a/parabola.kartesio b/parabola.kartesio
deleted file mode 100644
index 40d9fae..0000000
--- a/parabola.kartesio
+++ /dev/null
@@ -1,24 +0,0 @@
-table1|
-0.05|
-0.1025|
-0.1|
-0.09|
-0.2|
-0.14|
-0.3|
-0.19|
-0.368|
-0.235|
-0.415|
-0.272|
-0.49|
-0.34|
-0.53|
-0.42|
-0.7|
-0.65|
-function|
-y=a*(x^2)+b*x+c|
-result|
-y=1.82051*(x^2)+-0.523077*x+0.124103|
-the end|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index e3b91ee..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-set(kartesio_SRCS
- main.cpp
- mainwindow.cpp
- calculations.cpp
-)
-
-SET(kartesio_MOC_HDRS mainwindow.h)
-kde4_add_ui_files(kartesio_SRCS mainwindow.ui )
-
-QT4_AUTOMOC ( ${kartesio_SRCS} ${kartesio_MOC_SRCS} )
-QT4_WRAP_CPP ( kartesio_MOC_SRCS ${kartesio_MOC_HDRS} )
-
-
-SET(kartesio_EXECUTABLE
- ${kartesio_SRCS}
- ${kartesio_MOC_HDRS}
- ${kartesio_UI_HDRS}
-)
-
-kde4_add_app_icon(kartesio_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kartesio.png")
-kde4_add_executable(kartesio ${kartesio_EXECUTABLE})
-
-#target_link_libraries(kartesio ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARIES} kdeeduui)
-#target_link_libraries(kartesio ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARIES})
-target_link_libraries(kartesio ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARIES} ${KDE4_KIO_LIBS} zorbaneural)
-
-install(TARGETS kartesio DESTINATION ${BIN_INSTALL_DIR})
-install(FILES kartesioui.rc DESTINATION ${DATA_INSTALL_DIR}/kartesio)
-install(FILES kartesio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-kde4_install_icons(${ICON_INSTALL_DIR})
diff --git a/src/calculations.cpp b/src/calculations.cpp
deleted file mode 100644
index 45b2f04..0000000
--- a/src/calculations.cpp
+++ /dev/null
@@ -1,599 +0,0 @@
-/***************************************************************************
-* Kartesio is a program for calculating best fit curves with *
-* experimental points using regression algorithms or neural networks. *
-* *
-* Kartesio has been created by *
-* Luca Tringali, TRINGALINVENT at libero.it *
-* *
-* Copyright 2011-2013 Luca Tringali *
-* *
-* This program 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 2 of the License, or *
-* (at your option) any later version. *
-* *
-* This program 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 02110-1301, USA. *
-***************************************************************************/
-
-#include "calculations.h"
-
-Calculations::Calculations()
-{
- //
-}
-
-Calculations::~Calculations()
-{
- //
-}
-
-double Calculations::rmsError(QTableWidget *table, QString func) {
- double rms=0.0;
-
- if (!table->item(0,0) || table->item(0,0)->text().isEmpty())
- {
- //go on
- } else {
-
-
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- QScriptEngine myEngine;
- QByteArray ban = func.toLatin1();
- char *tmreporto = ban.data();
-
- QString istr;
- istr.append(QString("%1").arg((table->item(i,0)->data(Qt::DisplayRole).toDouble())));
- QString myscript = solvex(tmreporto,istr);
- QScriptValue three = myEngine.evaluate(myscript);
-
- double tvalue = three.toNumber();
- double diff = table->item(i,1)->data(Qt::DisplayRole).toDouble() - tvalue;
- rms+= std::pow(diff, 2);
- }
- }
- }
-
- return std::pow((rms/table->rowCount()),0.5);
-}
-
-QString Calculations::calculate(QTableWidget *table, QLineEdit *func) {
- //this function calculates the best fit curve from some points and a generic function
- m_resultFunction = "";
- m_myReport=i18n("Values obtained by maxima:")+'\n';
- m_width = int(m_xmax - m_xmin);
- int totalcoeff=0;
- QStringList coeff;
- QString myfunz;
- std::vector < std::vector <double> > allcoeffs;
-
-
- //uid.tableWidget->sortItems(1, Qt::AscendingOrder); //seems that the sorting doesn't work correctly
- if (!table->item(0,0) || table->item(0,0)->text().isEmpty())
- {
- //go on
- } else {
- //now we can plot the values
- QVarLengthArray<double, 64> px(table->rowCount());
- QVarLengthArray<double, 64> py(table->rowCount());
- int totaldata=0;
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- totaldata++;
- py[i] = table->item(i,1)->data(Qt::DisplayRole).toDouble();
- px[i] = table->item(i,0)->data(Qt::DisplayRole).toDouble();
- }
- }
- //now in the arrays px and py are stored the values of the points
- //we need to read the function and find a way to invert it
-
- //first of all we need to create an array of the coefficients
- //then, for every coefficient (e.g.: "a") we force the passage for one point
- //then we must solve the system
- //example of a correct system: solve([7=(a*(2^2))+(b*2)+c,13=(a*(3^2))+(b*3)+c,21=(a*(4^2))+(b*4)+c],[a,b,c]);
- //this procedure is replicated until every point has been used. Then we make the medium between the coefficient values
- //We will use the following command: maxima --batch-string="solve([7=(a*(2^2))+(b*2)+c,13=(a*(3^2))+(b*3)+c,21=(a*(4^2))+(b*4)+c],[a,b,c]);"
-
- //Try to fill the coeff list with all the coefficients and totalcoeff with the number of coefficients if there is a generic equation
- if (func->text()=="") return 0;
- QString yvalue = func->text();
- QString tempy;
- QString tempyn = "";
- tempy = "";
- if (check(yvalue)==false) return "";
- for (int i=0; i<yvalue.length()+1;i++) {
- if (yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M') tempyn = tempyn + yvalue[i];
- // every letter will be added in the variable tempyn so we can study it
- tempy = "";
- if (yvalue[i]=='=' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',' ) tempyn = "";
- //use the correct functions
- if (!(tempyn.isEmpty() or tempyn=="cos" or tempyn=="sin" or tempyn=="y" or tempyn=="x" or tempyn=="tan" or tempyn=="cot" or tempyn=="exp" or tempyn=="abs" or tempyn=="acos" or tempyn=="atan" or tempyn=="atan2" or tempyn=="asin" or tempyn=="ceil" or tempyn=="floor" or tempyn=="log" or tempyn=="ln" or tempyn=="max" or tempyn=="min" or tempyn=="random" or tempyn=="round" or tempyn=="sqrt")) {
- if ((yvalue[i+1]=='+' or yvalue[i+1]=='=' or yvalue[i+1]=='-' or yvalue[i+1]=='*' or yvalue[i+1]=='^' or yvalue[i+1]=='/' or yvalue[i+1]=='(' or yvalue[i+1]==')' or yvalue[i+1]=='1' or yvalue[i+1]=='2' or yvalue[i+1]=='3' or yvalue[i+1]=='4' or yvalue[i+1]=='5' or yvalue[i+1]=='6' or yvalue[i+1]=='7' or yvalue[i+1]=='8' or yvalue[i+1]=='9' or yvalue[i+1]=='0' or yvalue[i+1]=='.' or yvalue[i+1]==' ' or yvalue[i+1]==',' or yvalue[i+1]=='=' or (i+1)==(yvalue.length())) ) {
- coeff.append(tempyn);
- totalcoeff++;
- }
- }
- }
-
- m_tryNumber = 0;
-
- allcoeffs.resize(totalcoeff);
- for (int j=0; j<(totalcoeff);j++) {
- allcoeffs[j].resize(1);
- }
-
- //run the procedure until every point has been used
- for (int f=0; f<(totaldata);f++) {
- //we try to prepare the command line for maxima
- QString cmd = "maxima --batch-string=\"numer:true;solve([";
- int fir = 1;
- int i = f;
- //now i'm using the value of the points to fit the curve
- //REMEMBER that coeff.at(u) is the actual coefficient px[i] and py[i] are the x,y values of the point used
- for (int u=0; u<totalcoeff; u++) {
- QByteArray banf = func->text().toLatin1();
- char *tmfn = banf.data();
- QString xtmp;
- xtmp.setNum(px[i%totaldata]).replace(QString(","), QString("."));
- QString eqa = replacevar(tmfn,xtmp,QString("x"));
- QByteArray banfn = eqa.toLatin1();
- char *tmfns = banfn.data();
- xtmp.setNum(py[i%totaldata]).replace(QString(","), QString("."));
- QString eq = replacevar(tmfns,xtmp,QString("y"));
- if (fir==0) cmd = cmd + ','+ eq;
- if (fir==1) {
- cmd = cmd + eq;
- fir = 0;
- }
- i++;
- }
-
- cmd = cmd+"],[";
- fir= 1;
- for (int u=0; u<totalcoeff; u++) {
- if (fir==0) cmd = cmd + ','+coeff.at(u);
- if (fir==1) {
- cmd = cmd + coeff.at(u);
- fir = 0;
- }
- }
- cmd = cmd+"]);\" >> \"/tmp/kartesiotmp.txt\"";
-
- //run cmd in a linux shell
- QByteArray banfc = cmd.toLatin1();
- char *tmc = banfc.data();
- int go = system("rm /tmp/kartesiotmp.txt");
- go = system(tmc);
- // if go is not 0, then it means that maxima died
- if (go!=0) return QString("died");
-
- char tmpchr;
- ifstream texto("/tmp/kartesiotmp.txt");
- if (texto) {
- do {
- texto >> tmpchr;
- myfunz = myfunz + tmpchr;
- } while (!texto.eof());
- }
- texto.close();
-
- //now we have a string like this "...solve([1=a3+b3+c,2=a4+b4+c,3=a5+b5+c],[a,b,c])(%o2)[[a=0,b=1,c=-2]]]"
- //and we must read the values of the coefficients to store them in a list then we create the function
- //replacing the correct coefficient values into the original function written by user
-
- if (myfunz.indexOf("(%o2)")==-1) return 0;
- QString tempstr = myfunz.split("(%o2)").at(1);
- //we must delete [ and ]
- QString cancstr = tempstr.remove('[');
- cancstr = cancstr.remove(']');
- if (myfunz.indexOf(",")==-1 and totalcoeff>1) return 0;
- QStringList cmvalue = cancstr.split(',');
- m_myReport = m_myReport + cancstr+ '\n';
- //ignore the result if it is not a correct number
- int good = 1;
- for (int u=0; u<totalcoeff; u++) {
- for (int n=0; n<cmvalue.count() ; n++) {
- if (cmvalue.at(n).indexOf("=")==-1) {
- break;
- good = 0;
- }
- QStringList mnval = cmvalue.at(n).split('=');
- QScriptEngine myEnginee;
- QScriptValue isreal = myEnginee.evaluate(mnval.at(1)+"*0");
- if (isreal.toString()!="0") good = 0;
- }
- }
-
- //at this point, cmvalue contains the values of coefficients, for example the first element could be a=0
-
- myfunz = func->text();
-
- if (good == 1) {
- for (int u=0; u<totalcoeff; u++) {
- int r = 0;
- for (int n=0; n<cmvalue.count() ; n++) {
- if (cmvalue.at(n).indexOf("=")!=-1) {
- QStringList mnval = cmvalue.at(n).split('=');
- if (mnval.at(0)==coeff.at(u)) {
- //now we must sum the new value to the others
- if (m_resultFunction=="") m_resultFunction = myfunz;
- if (f!=0 and m_tryNumber!=0) { //remember that f begins with 0
- allcoeffs.at(u).resize(r+1);
- allcoeffs.at(u).at(r) = mnval.at(1).toDouble();
- r++;
- }
- m_tryNumber++;
- }
- }
- }
- }
- m_oldValue = cmvalue;
- }
- } //here ends the search for coefficients values
-
- if (m_resultFunction=="") m_resultFunction = myfunz;
- //mean for every coeff
- for (int u=0; u<totalcoeff; u++) {
- double mean = 0;
- for (int r=0; r<allcoeffs.at(u).size(); r++) {
- mean += allcoeffs.at(u).at(r);
- }
- mean = (mean/allcoeffs.at(u).size());
- QByteArray banf = m_resultFunction.toLatin1();
- char *tmfnz = banf.data();
- m_resultFunction = replacevar(tmfnz,QString::number(mean), coeff.at(u));
- }
-
- } //here ends the "else"
- return m_resultFunction;
-}
-
-
-QString Calculations::trainNN(QTableWidget *table, QComboBox *func, bool backprop, bool genalg)
-{
- //this function calculates the best fit curve from some points and a generic function
- m_resultFunction = "";
- //m_myReport="Values obtained by maxima:\n";
- m_width = int(m_xmax - m_xmin);
- int totalcoeff=0;
- //QStringList coeff;
- QString myfunz;
- std::vector<int> lSzV;
- int layers = 2;
- QString myresult = "";
-
-
- std::vector < std::vector <double> > dataV;
-
- //now we need to know which function has been selected
-
- //uid.tableWidget->sortItems(1, Qt::AscendingOrder); //seems that the sorting doesn't work correctly
- if (!table->item(0,0) || table->item(0,0)->text().isEmpty())
- {
- //go on
- } else {
-
- if (func->currentText() == "y=m*x+q") {
- totalcoeff = 2;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = table->item(i,0)->data(Qt::DisplayRole).toDouble(); //x
- dataV[i][1] = 1;
- dataV[i][2] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- if (func->currentText() == "y=a*(x^2)+b*x+c") {
- totalcoeff = 3;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 2); //x^2
- dataV[i][1] = table->item(i,0)->data(Qt::DisplayRole).toDouble(); //x
- dataV[i][2] = 1;
- dataV[i][3] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- if (func->currentText() == "y=a*(x^3)+b*(x^2)+c*x+d") {
- totalcoeff = 4;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 3); //x^3
- dataV[i][1] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 2); //x^2
- dataV[i][2] = table->item(i,0)->data(Qt::DisplayRole).toDouble(); //x
- dataV[i][3] = 1;
- dataV[i][4] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- if (func->currentText() == "y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e") {
- totalcoeff = 5;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 4); //x^4
- dataV[i][1] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 3); //x^3
- dataV[i][2] = pow(table->item(i,0)->data(Qt::DisplayRole).toDouble(), 2); //x^2
- dataV[i][3] = table->item(i,0)->data(Qt::DisplayRole).toDouble(); //x
- dataV[i][4] = 1;
- dataV[i][5] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- if (func->currentText() == "y=a*(e^x)+c") {
- totalcoeff = 2;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = exp(table->item(i,0)->data(Qt::DisplayRole).toDouble()); //exp(x)
- dataV[i][1] = 1;
- dataV[i][2] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- if (func->currentText() == "y=a*ln(x)+c") {
- totalcoeff = 2;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = log(table->item(i,0)->data(Qt::DisplayRole).toDouble()); //ln(x)
- dataV[i][1] = 1;
- dataV[i][2] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
-
- if (func->currentText() == "y=(a/x)+b") {
- totalcoeff = 2;
- dataV.resize(table->rowCount());
- for (int j=0; j<(table->rowCount());j++) {
- dataV[j].resize(totalcoeff+1);
- }
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- dataV[i][0] = (1/(table->item(i,0)->data(Qt::DisplayRole).toDouble())); //1/x
- dataV[i][1] = 1;
- dataV[i][2] = table->item(i,1)->data(Qt::DisplayRole).toDouble(); //y
- }
- }
- }
-
- lSzV.resize(layers);
- lSzV[0] = (totalcoeff-1);
- lSzV[1] = 1;
-
- //this is the common zorba neural network definition
-
- double learningRate = 0.1;
- double momentum = 0.1;
- int maxCrossoverNumber = 200;
-
- ZorbaNN *myNet = new ZorbaNN(layers, lSzV, learningRate, momentum);
- myNet->minAcceptableError = pow(10,-4);
- if (backprop==true) myNet->recursiveTrainBackProp(dataV, m_maxIters);
- if (genalg==true) myNet->recursiveTrainGenAlg(dataV, m_maxIters, maxCrossoverNumber);
-
- myresult = "y=";
-
- for (int f = 0; f<totalcoeff; f++) {
- //print the result: the number of weights is totalcoeff
- double temp = (1/(1+exp(-(myNet->getWeight(1,0,f)))));
- std::ostringstream strs;
- strs << std::fixed << std::setprecision(6) << temp;
- myresult = myresult + QString(strs.str().c_str());
- QString vars = "";
- if (func->currentText() == "y=m*x+q" && f == 0) vars = "*x+";
-
- if (func->currentText() == "y=a*(x^2)+b*x+c" && f == 0) vars = "*(x^2)+";
- if (func->currentText() == "y=a*(x^2)+b*x+c" && f == 1) vars = "*x+";
-
- if (func->currentText() == "y=a*(x^3)+b*(x^2)+c*x+d" && f == 0) vars = "*(x^3)+";
- if (func->currentText() == "y=a*(x^3)+b*(x^2)+c*x+d" && f == 1) vars = "*(x^2)+";
- if (func->currentText() == "y=a*(x^3)+b*(x^2)+c*x+d" && f == 2) vars = "*x+";
-
- if (func->currentText() == "y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e" && f == 0) vars = "*(x^4)+";
- if (func->currentText() == "y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e" && f == 1) vars = "*(x^3)+";
- if (func->currentText() == "y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e" && f == 2) vars = "*(x^2)+";
- if (func->currentText() == "y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e" && f == 3) vars = "*x+";
-
- if (func->currentText() == "y=a*(e^x)+c" && f == 0) vars = "*exp(x)+";
-
- if (func->currentText() == "y=a*ln(x)+c" && f == 0) vars = "*ln(x)+";
-
- if (func->currentText() == "y=(a/x)+b" && f == 0) vars = "/x+";
-
- myresult = myresult + vars;
- }
-
-
- } //here ends the "else"
-
- return myresult;
-}
-
-QString Calculations::solvex(QString yvalue, QString dnum) {
- //yvalue contains the equation of Y-axis variable
- //Remember that the function to elevate to power is Math.pow(b,e)
- //dnum is the value of x
- //the E must be changed to *10^: for example, the function
- //y=4.6374269005847954E-8*(x^3)+-1.8212280701754386E-5*(x^2)+0.002477485380117*x+0
- //should be
- //y=4.6374269005847954*10^-8*(x^3)+-1.8212280701754386*10^-5*(x^2)+0.002477485380117*x+0
-
- QString mreport;
- QString tempy;
- QString tempyold;
- QString tempyolda = "";
- QString tempyn = "";
- int olda =0;
- mreport ="";
- QString tempyval;
- tempy = "";
- if (check(yvalue)==false) return "";
- for (int i=0; i<yvalue.length()+1;i++) {
- if (yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M') tempyn = tempyn + yvalue[i];
- // every letter will be added in the variable tempyn so we can study it
- tempy = "";
- if (yvalue[i]=='=' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',' ) tempyn = "";
- if (tempyn=="x") tempy=dnum; //replace every x with the correct numerical value
- //use the correct functions
- if (tempyn=="cos") tempy = "Math.cos";
- if (tempyn=="sin") tempy = "Math.sin";
- if (tempyn=="tan") tempy = "Math.tan";
- if (tempyn=="cot") tempy = "Math.cot";
- if (tempyn=="exp") tempy = "Math.exp";
- if (tempyn=="abs") tempy = "Math.abs";
- if (tempyn=="acos") tempy = "Math.acos";
- if (tempyn=="atan") tempy = "Math.atan";
- if (tempyn=="atan2") tempy = "Math.atan2";
- if (tempyn=="asin") tempy = "Math.asin";
- if (tempyn=="ceil") tempy = "Math.ceil";
- if (tempyn=="floor") tempy = "Math.floor";
- if (tempyn=="log") tempy = "Math.log"; //here's the usual problem: some people call log the logarithm in e, others call it ln
- if (tempyn=="ln") tempy = "Math.log"; //here's the usual problem: some people call log the logarithm in e, others call it ln
- if (tempyn=="max") tempy = "Math.max";
- if (tempyn=="min") tempy = "Math.min";
- if (tempyn=="random") tempy = "Math.random";
- if (tempyn=="round") tempy = "Math.round";
- if (tempyn=="sqrt") tempy = "Math.sqrt";
- if (tempyn=="E") {
- tempy = "*Math.pow(10,";
- do{
- i++;
- tempy = tempy + yvalue[i];
- }while ((QString(yvalue[i+1])!=QString("*")));//until i+1=="*"
- tempy = tempy + ')';
- }
- //the simbol ^ should be replaced by Math.pow(base, exp)
- if (olda==1) {
- //we need to know when we get a simbol to know the power exponent is ended
- tempyold = tempyold + yvalue[i];
- if (yvalue[i]=='(' or yvalue[i]==')' ) {
- tempyval = tempyval + QString("Math.pow(") + tempyolda + QString(",") + tempyold + QString(")");
- tempyolda = "";
- tempyold = "";
- olda = 0;
- }
- } else {
- //if the character is a number or a mathematic simbol we simply copy it
- if ((yvalue[i]=='=' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',' ) and (olda!=1) ) tempyval = tempyval + yvalue[i];
- if (yvalue[i]=='^') {
- olda =1;
- }
- if ((yvalue[i+1]!='^') and (yvalue[i]!='^') and !(tempy.isEmpty())) {
- tempyval = tempyval + tempy;
- tempy ="";
- }
- if (yvalue[i+1]=='^') {
- tempyolda = tempy;
- tempy ="";
- }
- if (tempyval!="") mreport = tempyval;
- }
- }
- return mreport;
-}
-
-QString Calculations::replacevar(QString yvalue, QString dnum, QString var) {
- //yvalue contains the equation of Y-axis variable
- //Remember that the function to elevate to power is Math.pow(b,e)
- //dnum is the value of x
- QString mreport;
- QString tempy;
- QString tempyn = "";
- int olda =0;
- mreport ="";
- QString tempyval;
- tempy = "";
- if (check(yvalue)==false) return "";
- for (int i=0; i<yvalue.length()+1;i++) {
- if (yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M') tempyn = tempyn + yvalue[i];
- // every letter will be added in the variable tempyn so we can study it
- tempy = "";
- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',' ) tempyn = "";
- if ((yvalue[i+1]=='+' or yvalue[i+1]=='=' or yvalue[i+1]=='-' or yvalue[i+1]=='*' or yvalue[i+1]=='^' or yvalue[i+1]=='/' or yvalue[i+1]=='(' or yvalue[i+1]==')' or yvalue[i+1]=='1' or yvalue[i+1]=='2' or yvalue[i+1]=='3' or yvalue[i+1]=='4' or yvalue[i+1]=='5' or yvalue[i+1]=='6' or yvalue[i+1]=='7' or yvalue[i+1]=='8' or yvalue[i+1]=='9' or yvalue[i+1]=='0' or yvalue[i+1]=='.' or yvalue[i+1]==' ' or yvalue[i+1]==',' or yvalue[i+1]=='=' or (i+1)==(yvalue.length())) ) {
- if (tempyn==var) tempyval = tempyval + dnum; //replace every x with the correct value
- if (tempyn!=var) tempyval = tempyval + tempyn;
- tempyn = "";
- }
- //use the correct functions
- //if the carachter is a number or a mathematic simbol we simply copy it
- if ((yvalue[i]=='=' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='*' or yvalue[i]=='^' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',' ) and (olda!=1) ) tempyval = tempyval + yvalue[i];
-
- if (tempyval!="") mreport = tempyval;
- }
- return mreport;
-}
-
-bool Calculations::check(QString func) { //returns true if it does not contain dangerous chars, false if there is one
-
- bool result = true;
- if (func.isEmpty()) result = false;
-
- for (int i=0; i<func.length();i++) {
- if (!(func.at(i).isLetter() or func.at(i).isNumber() or func.at(i)=='+' or func.at(i)=='-' or func.at(i)=='^' or func.at(i)=='*' or func.at(i)=='/' or func.at(i)=='(' or func.at(i)==')' or func.at(i)=='.' or func.at(i)==','or func.at(i)=='=')) result = false;
- }
- if (func.indexOf("**")!=-1) result = false;
- if (func.indexOf("==")!=-1) result = false;
- if (func.indexOf("/*")!=-1) result = false;
- if (func.indexOf("//")!=-1) result = false;
- if (func.indexOf("\\")!=-1) result = false;
- if (func.indexOf("..")!=-1) result = false;
- if (func.indexOf(",,")!=-1) result = false;
-
- return result;
-}
-
diff --git a/src/calculations.h b/src/calculations.h
deleted file mode 100644
index f19efa3..0000000
--- a/src/calculations.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Kartesio is a program for calculating best fit curves with *
- * experimental points using regression algorithms or neural networks. *
- * *
- * Kartesio has been created by *
- * Luca Tringali, TRINGALINVENT at libero.it *
- * *
- * Copyright 2011-2013 Luca Tringali *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 02110-1301, USA. *
- ***************************************************************************/
-
-#include <math.h>
-#include <iostream>
-#include <fstream>
-#include <cstring>
-#include <cctype>
-#include <cstdlib>
-#include <cmath>
-#include <stdio.h>
-#include <stdlib.h>
-#include <float.h>
-#include <vector>
-
-#include <QtGui/QMainWindow>
-#include <QtGui/QTableWidget>
-#include <QtGui/QLineEdit>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptClass>
-#include <QtCore/QVarLengthArray>
-#include <QtGui/QComboBox>
-#include <QtGui/QTableWidgetItem>
-#include <KMessageBox>
-#include <KFileDialog>
-
-#include <KPlotWidget>
-#include <KPlotAxis>
-#include <KPlotObject>
-#include <KPlotPoint>
-#include <KDebug>
-#include <KAction>
-#include <KLocale>
-#include <KActionCollection>
-#include <KStandardAction>
-#include <KApplication>
-#include <KXmlGuiWindow>
-#include <KLocalizedString>
-
-#include <libzorbaneural/neuralnet.h>
-
-
-using namespace std;
-
-class Calculations
-{
-
- //private:
-public:
- explicit Calculations();
- virtual ~Calculations();
- /** calculate fitting curve with regression algorithm */
- QString calculate(QTableWidget *table, QLineEdit *func);
- /** calculate fitting curve with neural network */
- QString trainNN(QTableWidget *table, QComboBox *func, bool backprop, bool genalg);
- /** solve equation in a variable */
- QString solvex(QString yvalue, QString dnum);
- /** substitute a variable with another value */
- QString replacevar(QString yvalue, QString dnum, QString var);
- /** calculate rms error */
- double rmsError(QTableWidget *table, QString func);
- /** test the string to see if it contains dangerous chars */
- bool check(QString func);
-
- /** svg green line */
- QString m_greenPlot;
- /** svg blue line */
- QString m_bluePlot;
- /** latex green line */
- QString m_greenPlotLatex;
- /** latex blue line */
- QString m_bluePlotLatex;
- /** temporary string list */
- QStringList m_oldValue;
- /** the calculated function */
- QString m_resultFunction;
- /** the file actually opened (or just saved) */
- QString m_file;
- /** counting how many times the routing have been run */
- int m_tryNumber;
- /** minimumx x value */
- double m_xmin;
- /** maximum x value */
- double m_xmax;
- /** minimum y value */
- double m_ymin;
- /** maximum y value */
- double m_ymax;
- /** plot resolution */
- double m_resolution;
- /** last rms error calculated */
- double m_rmserror;
- /** maximum number of iteration for neural network training */
- long m_maxIters;
- /** width of the plottable area */
- int m_width;
- /** last Maxima report */
- QString m_myReport;
-};
-
diff --git a/src/kartesio.desktop b/src/kartesio.desktop
deleted file mode 100644
index b86e4ba..0000000
--- a/src/kartesio.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-# KDE Config File
-[Desktop Entry]
-Type=Application
-Exec=kartesio -caption %c %i
-Icon=kartesio
-X-DocPath=kartesio/index.html
-MimeType=chemical/x-kartesio;
-Comment=Calculate a best fit curve for some points
-Comment[bg]=Пресмятане на крива по зададени точки
-Comment[bs]=Računa krivu koja se najbolje uklapa za neke tačke
-Comment[da]=Beregn den bedst tilpassede kurve for nogle punkter
-Comment[de]=Berechnet die am besten passende Kurve für mehrere Punkte
-Comment[es]=Calcular la curva que mejor se ajusta a varios puntos
-Comment[et]=Parima sobivusega kõvera arvutamine mõningate punktide põhjal
-Comment[fi]=Laske käyrän paras sovitus tiettyjen pisteiden suhteen
-Comment[fr]=Calculez la courbe de meilleur ajustement pour certains points
-Comment[gl]=Calcular un axuste de curvas para puntos dados
-Comment[hu]=Kiszámítja a néhány pontra legjobban illeszkedő görbét
-Comment[it]=Calcola la migliore curva approssimante per una serie di punti
-Comment[km]=គណនាខ្សែកោងសមបំផុតសម្រាប់ចំណុចមួយចំនួន
-Comment[nds]=En op't best passen Bagen för en Reeg vun Pünkt utreken
-Comment[nl]=Een best passende kromme voor enige punten berekenen
-Comment[pl]=Oblicz krzywą najlepszego dopasowania dla pewnych punktów
-Comment[pt]=Calcular uma curva de ajuste óptimo para alguns pontos
-Comment[pt_BR]=Calcula uma curva de ajuste ótimo para alguns pontos
-Comment[sk]=Výpočet najlepšieho prechodu krivky pre niektoré body
-Comment[sv]=Beräkna en bästa kurvanpassning för ett antal punkter
-Comment[tr]=Bazı noktalar için en uygun eğriyi hesaplayın
-Comment[uk]=Визначення кривої найкращого наближення за декількома точками
-Comment[x-test]=xxCalculate a best fit curve for some pointsxx
-Comment[zh_CN]=计算多点的最佳拟合曲线
-Comment[zh_TW]=計算最符合某些點的曲線
-Terminal=false
-Name=Kartesio
-Name[ast]=Kartesio
-Name[bg]=Kartesio
-Name[bs]=Kartesio
-Name[cs]=Kartesio
-Name[da]=Kartesio
-Name[de]=Kartesio
-Name[es]=Kartesio
-Name[et]=Kartesio
-Name[fi]=Kartesio
-Name[fr]=Kartesio
-Name[ga]=Kartesio
-Name[gl]=Kartesio
-Name[hu]=Kartesio
-Name[it]=Kartesio
-Name[km]=Kartesio
-Name[mr]=कार्टेसिओ
-Name[nds]=Kartesio
-Name[nl]=Kartesio
-Name[pl]=Kartesio
-Name[pt]=Kartesio
-Name[pt_BR]=Kartesio
-Name[sk]=Kartesio
-Name[sv]=Kartesio
-Name[tr]=Kartesio
-Name[uk]=Kartesio
-Name[x-test]=xxKartesioxx
-Name[zh_CN]=Kartesio
-Name[zh_TW]=Kartesio
-GenericName=Best fit curve calculator
-GenericName[bg]=Пресмятане на криви
-GenericName[bs]=Račun krive najboljeg uklapanja
-GenericName[da]=Beregning af bedst tilpassede kurve
-GenericName[de]=Berechnung am besten passender Kurven
-GenericName[es]=Calculadora de ajuste de curvas
-GenericName[et]=Parima sobivusega kõvera arvutamine
-GenericName[fi]=Parhaan sovituksen laskemisohjelma
-GenericName[fr]=Calculateur de la courbe de meilleur ajustement
-GenericName[gl]=Calculadora de axuste de curvas
-GenericName[hu]=Legjobban illeszkedő görbe számító
-GenericName[it]=Calcolatore di curve approssimanti
-GenericName[km]=កម្មវិធីគណនាខ្សែកោងសមបំផុត
-GenericName[nds]=Reekner för op't best passen Bagens
-GenericName[nl]=Rekenmachine voor best passende kromme
-GenericName[pl]=Kalkulator krzywej najlepszego dopasowania
-GenericName[pt]=Calculadora de curvas de ajuste óptimo
-GenericName[pt_BR]=Calculadora de curvas de ajuste ótimo
-GenericName[sk]=Kalkulačka najlepšieho prechodu krivky
-GenericName[sv]=Beräkning av bästa kurvanpassning
-GenericName[tr]=En uygun eğri hesaplayıcı
-GenericName[uk]=Програма для обчислення кривої найкращого наближення
-GenericName[x-test]=xxBest fit curve calculatorxx
-GenericName[zh_CN]=最佳拟合曲线计算器
-GenericName[zh_TW]=最適曲線計算器
-Categories=Qt;KDE;Education;Science;Chemistry;Math;
diff --git a/src/kartesioui.rc b/src/kartesioui.rc
deleted file mode 100644
index b141b42..0000000
--- a/src/kartesioui.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gui name="kartesio"
- version="1"
- xmlns="http://www.kde.org/standards/kxmlgui/1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
- http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd" >
-
- <MenuBar>
- <Menu name="file" ><text>&File</text>
- <Action name="clear" />
- <Action name="open" />
- <Action name="save" />
- <Action name="saveas" />
- <Separator />
- <Action name="quit"/>
- </Menu>
- <Menu name="mplot" ><text>&Plot</text>
- <Action name="plot" />
- <Action name="example" />
- <Action name="expsvg" />
- <Action name="exptex" />
- <Separator />
- <Action name="report" />
- </Menu>
- </MenuBar>
-
- <ToolBar name="mainToolBar" >
- <text>Main Toolbar</text>
- <Action name="clear" />
- <Action name="open" />
- <Action name="save" />
- <Separator />
- <Action name="plot" />
- <Action name="expsvg" />
- <Action name="exptex" />
- </ToolBar>
-
-</gui>
diff --git a/src/main.cpp b/src/main.cpp
deleted file mode 100644
index a89b89a..0000000
--- a/src/main.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Kartesio is a program for calculating best fit curves with *
- * experimental points using regression algorithms or neural networks. *
- * *
- * Kartesio has been created by *
- * Luca Tringali, TRINGALINVENT at libero.it *
- * *
- * Copyright 2011-2013 Luca Tringali *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 02110-1301, USA. *
- ***************************************************************************/
-
-#include <QtGui/QApplication>
-
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <KUrl>
-
-#include "mainwindow.h"
-
-#define APP_VERSION "0.2.50"
-
-static const char description[] =
-I18N_NOOP("A program for calculating best fit curves with experimental points.");
-
-static const char version[] = APP_VERSION;
-
-
-int main(int argc, char *argv[])
-{
-
- KAboutData about("kartesio", 0, ki18n("Kartesio"), version, ki18n(description), KAboutData::License_GPL, ki18n("(C) 2011-2013 Luca Tringali"), KLocalizedString(), "www.zorbaproject.org/kartesio");
- about.addAuthor( ki18n("Luca Tringali"), KLocalizedString(), "TRINGALINVENT at libero.it" );
- //about.addCredit(ki18n("your name here"),ki18n("What you have done"));
-
- KCmdLineArgs::init(argc, argv, &about);
-
- KCmdLineOptions options;
- options.add("+[file]", ki18n("Document to open"));
- KCmdLineArgs::addCmdLineOptions(options);
-
- KApplication a;
-
- MainWindow *w = new MainWindow();
- w->show();
-
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- if (args->count())
- {
- w->Openarg(args->url(0).url());
- }
-
- return a.exec();
-}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
deleted file mode 100644
index d2734b7..0000000
--- a/src/mainwindow.cpp
+++ /dev/null
@@ -1,540 +0,0 @@
-/***************************************************************************
- * Kartesio is a program for calculating best fit curves with *
- * experimental points using regression algorithms or neural networks. *
- * *
- * Kartesio has been created by *
- * Luca Tringali, TRINGALINVENT at libero.it *
- * *
- * Copyright 2011-2013 Luca Tringali *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 02110-1301, USA. *
- ***************************************************************************/
-
-#include "mainwindow.h"
-
-MainWindow::MainWindow(QWidget *parent)
- : KXmlGuiWindow(parent)
-{
-
- setWindowIcon( KIcon( "kartesio" ) );
- KAction* clearAction = new KAction(this);
- clearAction->setText(i18n("&New"));
- clearAction->setIcon(KIcon("document-new"));
- clearAction->setShortcut(Qt::CTRL + Qt::Key_N);
- actionCollection()->addAction("clear", clearAction);
-
- KAction* openAction = new KAction(this);
- openAction->setText(i18n("&Open"));
- openAction->setIcon(KIcon("document-open"));
- openAction->setShortcut(Qt::CTRL + Qt::Key_O);
- actionCollection()->addAction("open", openAction);
-
- KAction* saveAction = new KAction(this);
- saveAction->setText(i18n("&Save"));
- saveAction->setIcon(KIcon("document-save"));
- saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
- actionCollection()->addAction("save", saveAction);
-
- KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
-
- KAction* saveasAction = new KAction(this);
- saveasAction->setText(i18n("&Save as"));
- saveasAction->setIcon(KIcon("document-save"));
- actionCollection()->addAction("saveas", saveasAction);
-
- KAction* plotAction = new KAction(this);
- plotAction->setText(i18n("Draw &Plot"));
- plotAction->setIcon(KIcon("kmplot"));
- plotAction->setShortcut(Qt::CTRL + Qt::Key_P);
- actionCollection()->addAction("plot", plotAction);
-
- KAction* exampleAction = new KAction(this);
- exampleAction->setText(i18n("Show &Example"));
- exampleAction->setShortcut(Qt::CTRL + Qt::Key_E);
- actionCollection()->addAction("example", exampleAction);
-
- KAction*expsvgAction = new KAction(this);
- expsvgAction->setText(i18n("Export as SVG"));
- expsvgAction->setIcon(KIcon("image-svg+xml"));
- actionCollection()->addAction("expsvg", expsvgAction);
-
- KAction*exptexAction = new KAction(this);
- exptexAction->setText(i18n("Export as Latex"));
- exptexAction->setIcon(KIcon("text-x-tex"));
- actionCollection()->addAction("exptex", exptexAction);
-
- KAction*reportAction = new KAction(this);
- reportAction->setText(i18n("Read Maxima Report"));
- reportAction->setIcon(KIcon("kate"));
- actionCollection()->addAction("report", reportAction);
-
-
- connect(clearAction,SIGNAL(triggered(bool)),this,SLOT(on_actionNew_triggered()));
- connect(plotAction,SIGNAL(triggered(bool)),this,SLOT(drawpl()));
- connect(openAction,SIGNAL(triggered(bool)),this,SLOT(on_actionOpen_triggered()));
- connect(saveAction,SIGNAL(triggered(bool)),this,SLOT(on_actionSave_triggered()));
- connect(saveasAction,SIGNAL(triggered(bool)),this,SLOT(on_actionSaveAs_triggered()));
- connect(expsvgAction,SIGNAL(triggered(bool)),this,SLOT(on_actionSvg_triggered()));
- connect(exptexAction,SIGNAL(triggered(bool)),this,SLOT(on_actionTex_triggered()));
- connect(exampleAction,SIGNAL(triggered(bool)),this,SLOT(on_actionShow_example_triggered()));
- connect(reportAction,SIGNAL(triggered(bool)),this,SLOT(on_actionReport_triggered()));
-
-
-
- setupGUI(Default, "kartesioui.rc");
- QWidget *widget = new QWidget( this );
-
- // create the user interface, the parent widget is "widget"
- uid.setupUi(widget);
- setCentralWidget(widget);
-
-
- mycalcs.m_xmin = 0;
- mycalcs.m_xmax = 50;
- mycalcs.m_ymin = 0;
- mycalcs.m_ymax = 50;
- mycalcs.m_resolution = 1.0;
- mycalcs.m_maxIters = 2000000;
- mycalcs.m_rmserror = 0.0;
- mycalcs.m_width = int(mycalcs.m_xmax - mycalcs.m_xmin);
- mycalcs.m_file = "";
-
- plot(uid.tableWidget, "", uid.originalplot->isChecked(),uid.fitplot->isChecked());
-
-
- connect( uid.pushButton,SIGNAL(clicked()),this, SLOT(on_pushButton_clicked()));
- connect( uid.pushButton_2,SIGNAL(clicked()),this, SLOT(on_pushButton_2_clicked()));
- connect( uid.xmin,SIGNAL(valueChanged(double)),this, SLOT(on_xmin_valueChanged(double)));
- connect( uid.xmax,SIGNAL(valueChanged(double)),this, SLOT(on_xmax_valueChanged(double)));
- connect( uid.ymin,SIGNAL(valueChanged(double)),this, SLOT(on_ymin_valueChanged(double)));
- connect( uid.ymax,SIGNAL(valueChanged(double)),this, SLOT(on_ymax_valueChanged(double)));
- connect( uid.resolution,SIGNAL(valueChanged(double)),this, SLOT(on_resolution_valueChanged(double)));
- connect( uid.maxIters,SIGNAL(valueChanged(double)),this, SLOT(on_maxiters_valueChanged(double)));
- connect( uid.fitplot,SIGNAL(stateChanged(int)),this, SLOT(on_fitplot_stateChanged(int)));
- connect( uid.originalplot,SIGNAL(stateChanged(int)),this, SLOT(on_originalplot_stateChanged(int)));
-
-}
-
-MainWindow::~MainWindow()
-{
- //delete ui;
- //delete mycalcs;
-}
-
-void MainWindow::on_sort_clicked()
-{
- for (int i=0; i<uid.tableWidget->rowCount() ; i++) {
- if (!uid.tableWidget->item(i,0) || uid.tableWidget->item(i,0)->text().isEmpty()) {
- uid.tableWidget->removeRow(i);
- }
- }
- uid.tableWidget->sortItems(1, Qt::AscendingOrder);
-}
-
-void MainWindow::on_pushButton_clicked()
-{
- if (mycalcs.check(uid.function->text())==false) return;
- if (!(uid.function->text().at(0)=='y' and uid.function->text().at(1)=='=')) return; //the function must start with "y="
- if (uid.function->text().lastIndexOf("=")!=1) return; //we need only one "=" and it must be the second char
-
- QString value = mycalcs.calculate(uid.tableWidget, uid.function);
- if (value==QString("died")) KMessageBox::error(this,i18n("Seems that Maxima process died calculating the result."),i18n("Error")) ;
- if (value!=QString("died")) {
- uid.result->setText(value);
- drawpl();
- }
-}
-
-void MainWindow::on_pushButton_2_clicked()
-{
- bool netcheck = true;
- for (int i=0; i<uid.tableWidget->rowCount() ; i++) {
- if (!uid.tableWidget->item(i,0) || uid.tableWidget->item(i,0)->text().isEmpty()) {
- break;
- } else {
- if (uid.tableWidget->item(i,0)->text().toDouble()<0 or uid.tableWidget->item(i,0)->text().toDouble()>1 or uid.tableWidget->item(i,1)->text().toDouble()<0 or uid.tableWidget->item(i,1)->text().toDouble()>1 ) netcheck = false;
- }
- }
- if (netcheck==false) KMessageBox::information(this,i18n("The neural network is able to use correctly only points between 0 and 1: you can divide them for a power of 10, to make them be in this interval. The network will try anyway to work with the points you have provided, but the resulting curve may not be correct."),i18n("Warning")) ;
- QString value = mycalcs.trainNN(uid.tableWidget, uid.comboBox, uid.backprop->isChecked(), uid.genalg->isChecked());
- uid.result->setText(value);
- drawpl();
-}
-
-void MainWindow::drawpl() {
- QString tempstr = "";
- if (!(uid.result->text().isEmpty())) tempstr = uid.result->text().split('=').at(1);
- plot(uid.tableWidget, tempstr, uid.originalplot->isChecked(),uid.fitplot->isChecked());
-}
-
-void MainWindow::on_actionReport_triggered() {
- if (mycalcs.m_myReport.isEmpty()) KMessageBox::information(this,i18n("No report to show."),"Maxima Report");
- if (!mycalcs.m_myReport.isEmpty()) KMessageBox::information(this,mycalcs.m_myReport,"Maxima Report");
-}
-
-void MainWindow::plot(QTableWidget *table, QString function, bool original, bool funz) {
-
- //this function plots the original points and the best fit curve
- mycalcs.m_width = int(mycalcs.m_xmax - mycalcs.m_xmin);
- //now I'm preparing the kplot widget
- uid.kplotwidget->removeAllPlotObjects();
- uid.kplotwidget->setLimits( mycalcs.m_xmin, mycalcs.m_xmax, mycalcs.m_ymin, mycalcs.m_ymax ); //now I need to set the limits of the plot
-
- KPlotObject *kpog = new KPlotObject( Qt::green, KPlotObject::Lines );
- KPlotObject *kpob = new KPlotObject( Qt::blue, KPlotObject::Lines );
-
- mycalcs.m_greenPlot = "<polyline points=\"";
- mycalcs.m_bluePlot = "<polyline points=\"";
- mycalcs.m_greenPlotLatex = "\\psline[linecolor=green, showpoints=false]";
- mycalcs.m_bluePlotLatex = "\\psline[linecolor=blue, showpoints=true]";
-
- if (!table->item(0,0) || table->item(0,0)->text().isEmpty())
- {
- //go on
- } else {
-
- if (uid.showerror->isChecked() && !(function.isEmpty())) {
- KPlotObject *kpol = new KPlotObject( Qt::white, KPlotObject::Points );
- kpol->setLabelPen(QPen( Qt::red, 3.0, Qt::SolidLine ) );
- QString error = i18n("RMS error: ");
- //if the error is too little, it is quite zero
- double myerr = mycalcs.rmsError(table, function);
- if (myerr<pow(10,-10)) myerr = 0.0;
- error = error + QString::number(myerr);
- //KMessageBox::information(this,"RMS error",error) ;
- double h = uid.ymax->value() - uid.ymin->value();
- kpol->addPoint(mycalcs.m_xmin+(mycalcs.m_width/50), mycalcs.m_ymax-(h/50), error, 0);
- uid.kplotwidget->addPlotObject(kpol);
- }
- //now we can plot the values
- QVarLengthArray<double, 64> px(table->rowCount());
- QVarLengthArray<double, 64> py(table->rowCount());
- int totaldata=0;
- for (int i=0; i<table->rowCount() ; i++) {
- if (!table->item(i,0) || table->item(i,0)->text().isEmpty()) {
- break;
- } else {
- totaldata++;
- if (original==true) kpob->addPoint(table->item(i,0)->data(Qt::DisplayRole).toDouble(), table->item(i,1)->data(Qt::DisplayRole).toDouble());
- mycalcs.m_bluePlot = mycalcs.m_bluePlot + ' ' + QString::number((table->item(i,0)->data(Qt::DisplayRole).toDouble()*10)+5).replace(QString(","), QString(".")) + ',' + QString::number((mycalcs.m_ymax-table->item(i,1)->data(Qt::DisplayRole).toDouble())*10).replace(QString(","), QString("."));
- mycalcs.m_bluePlotLatex = mycalcs.m_bluePlotLatex + '(' + QString::number((table->item(i,0)->data(Qt::DisplayRole).toDouble())).replace(QString(","), QString(".")) + ',' + QString::number((table->item(i,1)->data(Qt::DisplayRole).toDouble())).replace(QString(","), QString("."))+')';
- }
- }
- }
-
- if ((funz==true) && (!(function.isEmpty()))) {
- if (mycalcs.check(function)==false) return;
- //if (!(function.at(0)=='y' and function.at(1)=='=')) return; //the function must start with "y="
- //if (function.lastIndexOf("=")!=1) return; //we need only one "=" and it must be the second char
- //THIS IS THE PLOT OF BEST FIT CURVE
- double definition = mycalcs.m_resolution;
- double id = (mycalcs.m_xmin);
- int totalx = (int(mycalcs.m_xmax-mycalcs.m_xmin)*definition)+1;
- for (int i=0; i<totalx; i++) {
- QString mreporto = function;
- QScriptEngine myEngine;
- QByteArray ban = mreporto.toLatin1();
- char *tmreporto = ban.data();
-
- QString istr;
- istr.append(QString("%1").arg((id)));
- //now i'm using QScript language to solve the expression
- //in a future we can consider to change it supporting some backends, but it's really complex
- QString myscript = mycalcs.solvex(tmreporto,istr); //myscript is the equation converted in QScript language and with the value of x axis (istr) instead of "x" variable
- QScriptValue three = myEngine.evaluate(myscript);
-
- double tvalue = three.toNumber();
- if ((tvalue==tvalue) && (tvalue!=log(0)) && (tvalue!=-log(0))) kpog->addPoint((id), (tvalue)); //remember: tvalue == tvalue is needed to check if tvalue is NaN or not, while log(0) is the infinity
- mycalcs.m_greenPlot = mycalcs.m_greenPlot + ' ' + QString::number((id*10)+5).replace(QString(","), QString(".")) + ',' + QString::number((mycalcs.m_ymax-tvalue)*10).replace(QString(","), QString("."));
- mycalcs.m_greenPlotLatex = mycalcs.m_greenPlotLatex + '(' + QString::number(id).replace(QString(","), QString(".")) + ',' + QString::number((tvalue)).replace(QString(","), QString("."))+')';
- id = id + (1/definition);
- }
- uid.kplotwidget->addPlotObject(kpog);
- }
-
- uid.kplotwidget->addPlotObject(kpob);
-
- mycalcs.m_bluePlot = mycalcs.m_bluePlot + "\" style=\"stroke:blue;fill:none\"/> ";
- mycalcs.m_greenPlot = mycalcs.m_greenPlot + "\" style=\"stroke:green;fill:none\"/> ";
-
-}
-
-void MainWindow::on_xmin_valueChanged(double val)
-{
- mycalcs.m_xmin = val;
- drawpl();
-}
-
-void MainWindow::on_xmax_valueChanged(double val)
-{
- mycalcs.m_xmax = val;
- drawpl();
-}
-
-void MainWindow::on_ymin_valueChanged(double val)
-{
- mycalcs.m_ymin = val;
- drawpl();
-}
-
-void MainWindow::on_ymax_valueChanged(double val)
-{
- mycalcs.m_ymax = val;
- drawpl();
-}
-
-void MainWindow::on_resolution_valueChanged(double val)
-{
- mycalcs.m_resolution = val;
- drawpl();
-}
-
-void MainWindow::on_maxiters_valueChanged(double val)
-{
- mycalcs.m_maxIters = long(val);
-}
-
-
-void MainWindow::on_actionNew_triggered()
-{
- //set all the table cells as empty ("")
- uid.tableWidget->setRowCount(50);
- for (int i=0; i<uid.tableWidget->rowCount() ; i++) {
- QTableWidgetItem *titem = new QTableWidgetItem ;
- titem->setText("");
- uid.tableWidget->setItem(i,0,titem);
- QTableWidgetItem *titemo = new QTableWidgetItem ;
- titemo->setText("");
- uid.tableWidget->setItem(i,1,titemo);
- }
- //uid.tableWidget->clearContents();
- uid.function->setText("") ;
- uid.result->setText("") ;
- uid.xmin->setValue(0.00);
- uid.xmax->setValue(50.00);
- uid.ymin->setValue(0.00);
- uid.ymax->setValue(50.00);
- uid.resolution->setValue(1.00);
- plot(uid.tableWidget, "", uid.originalplot->isChecked(),uid.fitplot->isChecked());
- setCaption("");
-}
-
-void MainWindow::on_fitplot_stateChanged(int )
-{
- drawpl();
-}
-
-void MainWindow::on_originalplot_stateChanged(int )
-{
- drawpl();
-}
-
-void MainWindow::on_actionShow_example_triggered()
-{
- on_actionNew_triggered();
- QTableWidgetItem *titemo = uid.tableWidget->item(0,0);
- titemo = uid.tableWidget->item(0,0);
- titemo->setText("0");
- titemo = uid.tableWidget->item(0,1);
- titemo->setText("0");
- titemo = uid.tableWidget->item(1,0);
- titemo->setText("1.7");
- titemo = uid.tableWidget->item(1,1);
- titemo->setText("4");
- titemo = uid.tableWidget->item(2,0);
- titemo->setText("3.14");
- titemo = uid.tableWidget->item(2,1);
- titemo->setText("1");
-
- //uid.function->setText("y=(a*(x^3))+(b*(x^2))+(c*x)+d");
- uid.function->setText("y=a*sin(x)+b");
- uid.xmin->setValue(0.00);
- uid.xmax->setValue(4.00);
- uid.ymin->setValue(0.00);
- uid.ymax->setValue(5.00);
-}
-
-void MainWindow::on_actionOpen_triggered() {
- mycalcs.m_file = KFileDialog::getOpenFileName(KUrl(), "*.kartesio|Kartesio File (*.kartesio)", this, i18n("Open work")); // getOpenFileName(this,"Open work","","Kartesio File (*.kartesio)");
- Openfile();
-}
-
-void MainWindow::Openarg(QString filename) {
- //remove the first 7 characters
- mycalcs.m_file = filename.remove(0,7);
- Openfile();
-}
-
-void MainWindow::Openfile() {
- //loads all the cells text from a file prevoiusly saved
- if (!(mycalcs.m_file.isEmpty())) {
- setCaption(mycalcs.m_file); //for some reason I don't get, this method doesn't work
- QByteArray bac = mycalcs.m_file.toLatin1();
- char *filec = bac.data();
- ifstream texto(filec);
- if (!texto) KMessageBox::error(this,i18n("Unable to open ")+mycalcs.m_file,i18n("Error")) ;
- if (texto) {
- on_actionNew_triggered();
- QString tempyval;
- char tmpchr;
- int i = 0;
- QString tempya;
- int tablea = 0;
- int xax = 0;
- int res = 0;
- do {
- texto >> tmpchr;
- if (tmpchr!='|') tempyval = tempyval + tmpchr;
- if (tmpchr=='|') {
- if ((tablea==1) and (tempyval != QString("table1")) and (tempyval != QString("function")) and (tempyval != QString("result")) ) {
- if ((i%2)!=0) {
- QTableWidgetItem *titemo = uid.tableWidget->item((i-1)/2,1) ;
- if (titemo) titemo->setText(tempyval) ;
- } else {
- QTableWidgetItem *titem = uid.tableWidget->item((i/2),0) ;
- if (titem) titem->setText(tempyval) ;
- }
- i++;
- }
-
-
- if ((xax==1) and (tempyval != QString("table1")) and (tempyval != QString("function")) and (tempyval != QString("result")) ) {
- uid.function->setText(tempyval);
- xax = 0;
- }
-
- if ((res==1) and (tempyval != QString("table1")) and (tempyval != QString("function")) and (tempyval != QString("result")) ) {
- uid.result->setText(tempyval);
- res = 0;
- }
-
- if (tempyval == QString("table1")) {
- i=0;
- tablea=1;
- xax = 0;
- res = 0;
- }
- if (tempyval == QString("function")) {
- tablea=0;
- xax = 1;
- res = 0;
- }
- if (tempyval == QString("result")) {
- tablea=0;
- xax = 0;
- res = 1;
- }
-
- tempyval = "";
- }
- } while (!texto.eof());
- texto.close();
- }
- }
-
-}
-
-void MainWindow::on_actionSave_triggered() {
- if (mycalcs.m_file.isEmpty()) {
- on_actionSaveAs_triggered();
- exit;
- }
- //save all the cells values
-
- QString tempyval;
- tempyval = "table1|";
- for (int i=0; i<uid.tableWidget->rowCount() ; i++) {
- QTableWidgetItem *titem = uid.tableWidget->item(i,0) ;
- QTableWidgetItem *titemo = uid.tableWidget->item(i,1) ;
- if (!titem || titem->text().isEmpty()) {
- break;
- } else {
- QString yvaluerq = titemo->data(Qt::DisplayRole).toString() ;
- QString valuerq = titem->data(Qt::DisplayRole).toString() ;
- tempyval = tempyval + QString("\n") + valuerq + QString("|\n") + yvaluerq + QString("|");
- }
- }
- tempyval = tempyval + QString("\nfunction|");
- tempyval = tempyval + QString("\n") + uid.function->text() + QString("|");
- tempyval = tempyval + QString("\nresult|");
- tempyval = tempyval + QString("\n") + uid.result->text() + QString("|");
-
- tempyval = tempyval + QString("\nthe end|\n");
-
- if (!(mycalcs.m_file.isEmpty())) {
- QByteArray ba = tempyval.toLatin1();
- char *strsave = ba.data();
- QByteArray bac = mycalcs.m_file.toLatin1();
- char *filec = bac.data();
-
- ofstream out(filec);
- if (!out) KMessageBox::error(this,i18n("Unable to create ")+mycalcs.m_file,i18n("Error")) ;
- out << strsave;
- out.close();
- }
-}
-void MainWindow::on_actionSaveAs_triggered() {
- //save as
- mycalcs.m_file = KFileDialog::getSaveFileName(KUrl(), "*.kartesio|Kartesio File (*.kartesio)", this, i18n("Save work")); //"*.cpp|Sources (*.cpp)" (this,"Save work","","Kartesio File (*.kartesio)");
- setCaption(mycalcs.m_file);
- on_actionSave_triggered();
-}
-void MainWindow::on_actionSvg_triggered() {
- //This function saves the plot into a SVG file
- QString svgheader = "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"no\"?> <!DOCTYPE svg PUBLIC \"-//W3C//Dtd SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/Dtd/svg11.dtd\"> <svg width=\""+ QString::number((mycalcs.m_xmax*10)+5)+ "\" height=\""+ QString::number((mycalcs.m_ymax*10)+5)+ "\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\"><polyline points=\"5," + QString::number(mycalcs.m_ymax*10) + " " + QString::number((mycalcs.m_xmax*10)-5) + "," + QString::number(mycalcs.m_ymax*10) + " " + QString::number((mycalcs.m_xmax*10)-5) + "," + QString::number((mycalcs.m_ymax*10)-5) + " " + QString::number(mycalcs.m_xmax*10) + "," + QString::number(mycalcs.m_ymax*10) + " " + QString::number((mycalcs.m_xmax*10)-5) + "," + QString::number((mycalcs.m_ymax*10)+5) + " " + QString::number((mycalcs.m_xmax*10)-5) + "," + QString::number(mycalcs.m_ymax*10) + "\" style=\"stroke:black;fill:none\"/> <polyline points=\"5," + QString::number(mycalcs.m_ymax*10);
- svgheader += " 5,5 10,5 5,0 0,5 5,5\" style=\"stroke:black;fill:none\"/> ";
- QString svgcomplete = svgheader ;
- if (uid.fitplot->isChecked()) svgcomplete = svgcomplete + mycalcs.m_greenPlot ;
- if (uid.originalplot->isChecked()) svgcomplete = svgcomplete + mycalcs.m_bluePlot;
- svgcomplete = svgcomplete + "</svg> ";
-
- QString files = KFileDialog::getSaveFileName(KUrl(), "*.svg|Svg image (*.svg)", this, i18n("Save plot")); //(this,"Save plot","","Svg image (*.svg)");
- if (!(files.isEmpty())) {
- QByteArray svgt = svgcomplete.toLatin1();
- char *strsave = svgt.data();
- QByteArray ban = files.toLatin1();
- char *filec = ban.data();
-
- ofstream out(filec);
- if (!out) KMessageBox::error(this,i18n("Unable to create ")+files,i18n("Error")) ;
- out << strsave;
- out.close();
- }
-}
-void MainWindow::on_actionTex_triggered() {
- //save as latex
-
- QString texheader = "\\documentclass[a4paper,12pt]{article}\n \\usepackage{pst-plot}\n \\begin{document} \n \\psset{xunit=1mm,yunit=1mm} %you can make the plot bigger changing xunit and yunit value";
- QString texcomplete = texheader ;
- if (uid.fitplot->isChecked()) texcomplete = texcomplete + '\n' + mycalcs.m_greenPlotLatex ;
- if (uid.originalplot->isChecked()) texcomplete = texcomplete + '\n' + mycalcs.m_bluePlotLatex;
- texcomplete = texcomplete + QString(" \n \\[ ") + uid.result->text() + QString(" \\] \n \\end{document} ");
-
- QString files = KFileDialog::getSaveFileName(KUrl(), "*.tex|Latex document (*.tex)", this, i18n("Save plot")); //getSaveFileName(this,"Save plot","","Latex document (*.tex)");
- if (!(files.isEmpty())) {
- QByteArray tex = texcomplete.toLatin1();
- char *strsave = tex.data();
- QByteArray ban = files.toLatin1();
- char *filec = ban.data();
-
- ofstream out(filec);
- if (!out) KMessageBox::error(this,i18n("Unable to create ")+files,i18n("Error")) ;
- out << strsave;
- out.close();
- if (out) KMessageBox::information(this,i18n("Please note that you can't use pdflatex to convert this file directly into a pdf file. You can convert it only into dvi, and then it will be possible to create a pdf."),i18n("Well done")) ;
- }
-
-}
diff --git a/src/mainwindow.h b/src/mainwindow.h
deleted file mode 100644
index f1c6045..0000000
--- a/src/mainwindow.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Kartesio is a program for calculating best fit curves with *
- * experimental points using regression algorithms or neural networks. *
- * *
- * Kartesio has been created by *
- * Luca Tringali, TRINGALINVENT at libero.it *
- * *
- * Copyright 2011-2013 Luca Tringali *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 02110-1301, USA. *
- ***************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include "src/ui_mainwindow.h"
-#include "calculations.h"
-
-using namespace std;
-
-class MainWindow : public KXmlGuiWindow
-{
- Q_OBJECT
-
-public:
- explicit MainWindow(QWidget *parent = 0);
- ~MainWindow();
- void Openarg(QString filename); ///open file
-
-private slots:
- void on_pushButton_clicked();
- void on_pushButton_2_clicked();
- void on_sort_clicked();
- void on_xmin_valueChanged(double );
- void on_xmax_valueChanged(double );
- void on_ymin_valueChanged(double );
- void on_ymax_valueChanged(double );
- void on_resolution_valueChanged(double );
- void on_maxiters_valueChanged(double );
-
- void on_actionNew_triggered();
- void on_fitplot_stateChanged(int );
- void on_originalplot_stateChanged(int );
- void on_actionShow_example_triggered();
- void on_actionOpen_triggered();
- void on_actionReport_triggered();
- void on_actionSave_triggered();
- void on_actionSaveAs_triggered();
- void on_actionSvg_triggered();
- void on_actionTex_triggered();
- void drawpl(); ///draw plot
-
-private:
- Ui::centralWidget uid; ///ui wigdet
-
- void plot(QTableWidget* table, QString function, bool original, bool funz); ///draw plot
- void Openfile(); ///open file (without argument)
- Calculations mycalcs ; //object from class Calculations
-};
-
-#endif // MAINWINDOW_H
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
deleted file mode 100644
index 8243520..0000000
--- a/src/mainwindow.ui
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>centralWidget</class>
- <widget class="QWidget" name="centralWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>716</width>
- <height>348</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="9" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Best fit curve:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="result"/>
- </item>
- </layout>
- </item>
- <item row="7" column="1">
- <widget class="QTabWidget" name="tabWidget">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>67</height>
- </size>
- </property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Regression</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Write a function like "y=a*(x^2)+b*x+c":</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="function"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton">
- <property name="text">
- <string>Best Fit</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Neural network</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Wanted line:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox">
- <item>
- <property name="text">
- <string>y=m*x+q</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=a*(x^2)+b*x+c</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=a*(x^3)+b*(x^2)+c*x+d</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=a*(x^4)+b*(x^3)+c*(x^2)+d*x+e</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=a*(e^x)+c</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=a*ln(x)+c</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>y=(a/x)+b</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Iterations:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="maxIters">
- <property name="decimals">
- <number>0</number>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>1000000000.000000000000000</double>
- </property>
- <property name="value">
- <double>2000000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="backprop">
- <property name="text">
- <string>BackProp</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="genalg">
- <property name="text">
- <string>GenAlg</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_2">
- <property name="text">
- <string>Calculate</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7"/>
- </item>
- <item>
- <widget class="QTableWidget" name="tableWidget">
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <row>
- <property name="text">
- <string/>
- </property>
- </row>
- <column>
- <property name="text">
- <string>Xaxis</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Yaxis</string>
- </property>
- </column>
- <item row="0" column="0">
- <property name="text">
- <string/>
- </property>
- </item>
- <item row="0" column="1">
- <property name="text">
- <string/>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>X min:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="xmin">
- <property name="minimum">
- <double>-500.000000000000000</double>
- </property>
- <property name="maximum">
- <double>500.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>X max:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="xmax">
- <property name="minimum">
- <double>-500.000000000000000</double>
- </property>
- <property name="maximum">
- <double>500.000000000000000</double>
- </property>
- <property name="value">
- <double>50.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Y min:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="ymin">
- <property name="minimum">
- <double>-500.000000000000000</double>
- </property>
- <property name="maximum">
- <double>500.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Y max:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="ymax">
- <property name="minimum">
- <double>-500.000000000000000</double>
- </property>
- <property name="maximum">
- <double>500.000000000000000</double>
- </property>
- <property name="value">
- <double>50.000000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Plot resolution:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="resolution">
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="showerror">
- <property name="text">
- <string>Show RMS error</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QCheckBox" name="originalplot">
- <property name="text">
- <string>Show original points</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="fitplot">
- <property name="text">
- <string>Show best fit curve</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="KPlotWidget" name="kplotwidget">
- <property name="backgroundColor">
- <color>
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </property>
- <property name="foregroundColor">
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </property>
- <property name="grid" stdset="0">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KPlotWidget</class>
- <extends>QFrame</extends>
- <header>kplotwidget.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
More information about the kde-doc-english
mailing list