[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kalgebra
From: Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date: 2011-01-14 7:26:39
Message-ID: 20110114072639.951E73E1F1 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1214327 by apol:
Removed unneeded include files and some dependencies in order to start to get rid of \
analitza internals dependencies from the actual use of the library.
M +0 -1 analitzagui/algebrahighlighter.cpp
M +0 -3 analitzagui/functionimplicit.cpp
M +14 -33 analitzagui/functionparametric.cpp
M +7 -13 analitzagui/functionpolar.cpp
M +3 -3 analitzagui/operatorsmodel.cpp
M +4 -7 analitzagui/operatorsmodel.h
M +1 -0 utils/main.cpp
--- trunk/KDE/kdeedu/kalgebra/analitzagui/algebrahighlighter.cpp #1214326:1214327
@@ -25,7 +25,6 @@
#include <analitza/expression.h>
#include <analitza/analyzer.h>
#include <analitza/variables.h>
-#include <analitza/container.h>
#include <analitza/explexer.h>
#include <analitza/expressionparser.h>
--- trunk/KDE/kdeedu/kalgebra/analitzagui/functionimplicit.cpp #1214326:1214327
@@ -23,8 +23,6 @@
#include <KLocale>
#include "analitza/value.h"
-#include "analitza/vector.h"
-#include "analitza/container.h"
#include "analitza/expressiontype.h"
#include "analitza/variable.h"
#include "analitza/variables.h"
@@ -34,7 +32,6 @@
using Analitza::Expression;
using Analitza::ExpressionType;
using Analitza::Variables;
-using Analitza::Vector;
using Analitza::Object;
using Analitza::Cn;
--- trunk/KDE/kdeedu/kalgebra/analitzagui/functionparametric.cpp #1214326:1214327
@@ -20,10 +20,7 @@
#include "functionimpl.h"
#include "functionfactory.h"
#include "analitza/value.h"
-#include "analitza/vector.h"
-#include <analitza/container.h>
#include <analitza/expressiontype.h>
-#include <analitza/variable.h>
#include <KDebug>
#include <KLocale>
@@ -31,7 +28,6 @@
using Analitza::Expression;
using Analitza::ExpressionType;
using Analitza::Variables;
-using Analitza::Vector;
using Analitza::Object;
using Analitza::Cn;
@@ -129,7 +125,7 @@
// double inv_res= double((ulimit-dlimit)/resolution());
double inv_res= 0.01;
- double final=ulimit-inv_res;
+// double final=ulimit-inv_res;
//by percy
QRectF vp(viewport);
@@ -143,10 +139,6 @@
vx->setValue(dlimit);
Expression res;
- Object* vo;
- Vector* v;
- Cn *x;
- Cn *y;
int i = 0;
bool jlock = false;
@@ -155,12 +147,10 @@
vx->setValue(t);
res=func.calculateLambda();
- vo=res.tree();
- v=static_cast<Vector*>(vo);
- x=static_cast<Cn*>(v->at(0));
- y=static_cast<Cn*>(v->at(1));
+ Cn x=res.elementAt(0).toReal();
+ Cn y=res.elementAt(1).toReal();
- curp = QPointF(x->value(), y->value());
+ curp = QPointF(x.value(), y.value());
if (vp.contains(curp))
{
@@ -174,10 +164,7 @@
}
// objectWalker(vo);
- Q_ASSERT(vo->type()==Object::vector);
- Q_ASSERT(v->size()==2
- && v->at(0)->type()==Object::value
- && v->at(1)->type()==Object::value);
+ Q_ASSERT(res.isVector());
}
}
@@ -185,9 +172,8 @@
{
vx->setValue(0.);
Expression res=func.calculateLambda();
- Object* vo=res.tree();
- if(func.isCorrect() && func.expression().lambdaBody().isVector())
+ Q_ASSERT(func.isCorrect() && func.expression().lambdaBody().isVector());
{
Analitza::Analyzer f(func.variables());
f.setExpression(Analitza::Expression("t->" + \
func.expression().lambdaBody().elementAt(0).toString() + "+" + \
QString::number(-1.0*point.x()), false)); @@ -255,19 +241,16 @@
vx->setValue(t);
- Vector* v2 = static_cast<Vector*>(func.calculateLambda().tree());
- Analitza::Cn *comp1 = static_cast<Cn*>(v2->at(0));
- Analitza::Cn *comp2 = static_cast<Cn*>(v2->at(1));
+ Analitza::Cn comp1 = res.elementAt(0).toReal();
+ Analitza::Cn comp2 = res.elementAt(1).toReal();
- return QPair<QPointF, QString>(QPointF(comp1->value(), comp2->value()), \
QString()); + return QPair<QPointF, QString>(QPointF(comp1.value(), \
comp2.value()), QString()); }
- else
- return QPair<QPointF, QString>(point, QString());
}
QLineF FunctionParametric::derivative(const QPointF& point)
{
- if(func.isCorrect() && func.expression().lambdaBody().isVector())
+ Q_ASSERT(func.isCorrect() && func.expression().lambdaBody().isVector());
{
Analitza::Analyzer f(func.variables());
f.setExpression(Analitza::Expression("t->" + \
func.expression().lambdaBody().elementAt(0).toString() + "+" + \
QString::number(-1.0*point.x()), false)); @@ -339,14 +322,12 @@
vx->setValue(t);
- Vector* v = static_cast<Vector*>(dfunc.calculateLambda().tree());
- Analitza::Cn *comp1 = static_cast<Cn*>(v->at(0));
- Analitza::Cn *comp2 = static_cast<Cn*>(v->at(1));
+ Expression exp=dfunc.calculateLambda();
+ Analitza::Cn comp1 = exp.elementAt(0).toReal();
+ Analitza::Cn comp2 = exp.elementAt(1).toReal();
- double m = comp2->value()/comp1->value();
+ double m = comp2.value()/comp1.value();
return slopeToLine(m);
}
- else
- return QLineF();
}
--- trunk/KDE/kdeedu/kalgebra/analitzagui/functionpolar.cpp #1214326:1214327
@@ -20,8 +20,6 @@
#include "functionimpl.h"
#include "functionfactory.h"
#include "analitza/value.h"
-#include <analitza/variable.h>
-#include "analitza/vector.h"
#include <analitza/expressiontype.h>
#include <KLocale>
@@ -202,8 +200,8 @@
Analitza::Analyzer newfunc(func.variables());
newfunc.setExpression(Analitza::Expression(polart, false));
- if(newfunc.isCorrect() && newfunc.expression().lambdaBody().isVector())
- {
+ Q_ASSERT(newfunc.isCorrect() && newfunc.expression().lambdaBody().isVector());
+
Analitza::Analyzer f(newfunc.variables());
f.setStack(m_runStack);
f.setExpression(Analitza::Expression("t->" + \
newfunc.expression().lambdaBody().elementAt(0).toString() + "+" + \
QString::number(-1.0*point.x()), false)); @@ -230,8 +228,7 @@
if(point.x()<0.) t0 += pi;
else if(t0<0.) t0 += 2.*pi;
- t0=qMax(t0, downlimit());
- t0=qMin(t0, uplimit());
+ t0=qBound(downlimit(), t0, uplimit());
double t = t0;
double error = 1000.0;
@@ -283,14 +280,11 @@
m_th->setValue(t);
- Analitza::Vector* v = \
static_cast<Analitza::Vector*>(dfunc.calculateLambda().tree());
- Analitza::Cn *comp1 = static_cast<Cn*>(v->at(0));
- Analitza::Cn *comp2 = static_cast<Cn*>(v->at(1));
+ Expression res = dfunc.calculateLambda();
+ Cn comp1 = res.elementAt(0).toReal();
+ Cn comp2 = res.elementAt(1).toReal();
- double m = comp2->value()/comp1->value();
+ double m = comp2.value()/comp1.value();
return slopeToLine(m);
}
- else
- return QLineF();
-}
--- trunk/KDE/kdeedu/kalgebra/analitzagui/operatorsmodel.cpp #1214326:1214327
@@ -110,7 +110,7 @@
reset();
}
-QString OperatorsModel::sample(Operator oper)
+QString OperatorsModel::sample(const Analitza::Operator& oper)
{
QString funcname=oper.toString();
QString bounds;
@@ -134,7 +134,7 @@
}
}
-QString OperatorsModel::description(Operator o)
+QString OperatorsModel::description(const Analitza::Operator& o)
{
QString s;
switch(o.operatorType()) {
@@ -347,7 +347,7 @@
return s;
}
-QString OperatorsModel::example(Operator o)
+QString OperatorsModel::example(const Analitza::Operator& o)
{
QString s;
--- trunk/KDE/kdeedu/kalgebra/analitzagui/operatorsmodel.h #1214326:1214327
@@ -20,12 +20,12 @@
#define OPERATORSMODEL_H
#include <QAbstractTableModel>
-#include <analitza/operator.h>
#include "analitzaguiexport.h"
namespace Analitza
{
class Variables;
+class Operator;
}
/** Operators model is a model class that has a relation of all operators string \
with their OperatorType. */ @@ -35,16 +35,13 @@
/** Constructor. Creates a new Operator Model. */
explicit OperatorsModel(QObject *parent=0);
- /** Returns how many operators we have. */
- // int count() const { return m_count; }
-
/** Returns the description of the @p o operator. */
- static QString description(Analitza::Operator o);
+ static QString description(const Analitza::Operator& o);
/** Returns the description of the @p o operator. */
- static QString sample(Analitza::Operator o);
+ static QString sample(const Analitza::Operator& o);
- static QString example(Analitza::Operator o);
+ static QString example(const Analitza::Operator& o);
/** Adds an entry to the model. */
// void addEntry(int i, const QString&, const QString&, const QString& \
ex=QString());
--- trunk/KDE/kdeedu/kalgebra/utils/main.cpp #1214326:1214327
@@ -21,6 +21,7 @@
#include <QStringList>
#include <QFile>
#include <QTextDocument>
+#include <QtCore/QTextStream>
int main(int argc, char** argv)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic