[ellipsoids] r2765 committed - issue 133...

[ellip...@googlecode.com]

Revision: 2765
Author: anna.ata...@gmail.com
Date: Thu Mar 6 15:19:33 2014 UTC
Log: issue 133
Enhancement: committing a few changes
http://code.google.com/p/ellipsoids/source/detail?r=2765

Added:

/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/getDiffApprox.m

/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/getSeveralEllTubes.m
Modified:

/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/example_cut.m

=======================================
--- /dev/null
+++
/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/getDiffApprox.m
Thu Mar 6 15:19:33 2014 UTC
@@ -0,0 +1,37 @@
+% An example of concatenating ellipsoid tube objects containing random
+% number of ellipsoid tubes (from one to ten tubes).
+%
+nTubes = randi(10,1);
+nPoints = 20;
+type = 1;
+timeBeg1 = 0;
+timeEnd1 = 1;
+firstEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg1,timeEnd1,type,nPoints);
+timeBeg2 = 1;
+timeEnd2 = 2;
+secondEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg2,timeEnd2,type,nPoints);
+%
+% Concatenating firstEllTube and secondEllTube on [timeBeg1, timeEnd2]
+% vector of time.
+%
+resEllTubeObj = firstEllTubeObj.cat(secondEllTubeObj);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from secondEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',true);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from firstEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',false);
+%
+% Note that we cannot concatenate ellipsoid tubes with overlapping time
+% limits.
+%
+
+
=======================================
--- /dev/null
+++
/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/getSeveralEllTubes.m
Thu Mar 6 15:19:33 2014 UTC
@@ -0,0 +1,37 @@
+% An example of concatenating ellipsoid tube objects containing random
+% number of ellipsoid tubes (from one to ten tubes).
+%
+nTubes = randi(10,1);
+nPoints = 20;
+type = 1;
+timeBeg1 = 0;
+timeEnd1 = 1;
+firstEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg1,timeEnd1,type,nPoints);
+timeBeg2 = 1;
+timeEnd2 = 2;
+secondEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg2,timeEnd2,type,nPoints);
+%
+% Concatenating firstEllTube and secondEllTube on [timeBeg1, timeEnd2]
+% vector of time.
+%
+resEllTubeObj = firstEllTubeObj.cat(secondEllTubeObj);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from secondEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',true);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from firstEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',false);
+%
+% Note that we cannot concatenate ellipsoid tubes with overlapping time
+% limits.
+%
+
+
=======================================
---
/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/example_cut.m
Mon Nov 11 04:51:12 2013 UTC
+++
/branches/issue_133_aatanesyan/products/+gras/+ellapx/+smartdb/+test/+examples/example_cut.m
Thu Mar 6 15:19:33 2014 UTC
@@ -1,26 +1,37 @@
-% An example of usage of CUT function from EllTubeBasic class. In
-% this example an ellipsoid tube object is created, using TimeVec time
-% vector. Then it is cut using cutTimeVec time vector or cutTimePoint point
-% of time.
-nPoints=10;
-calcPrecision=0.001;
-approxSchemaDescr=char.empty(1,0);
-approxSchemaName=char.empty(1,0);
-nDims=3;
-nTubes=1;
-lsGoodDirVec=[1;0;1];
-aMat=zeros(nDims,nPoints);
-timeVec=1:nPoints;
-sTime=nPoints;
-approxType=gras.ellapx.enums.EApproxType.Internal;
-qArrayList=repmat({repmat(diag([1 2 3]),[1,1,nPoints])},...
- 1,nTubes);
-ltGoodDirArray=repmat(lsGoodDirVec,[1,nTubes,nPoints]);
-fromMatEllTube=gras.ellapx.smartdb.rels.EllTube.fromQArrays(...
- qArrayList, aMat, timeVec,...
- ltGoodDirArray, sTime, approxType, approxSchemaName,...
- approxSchemaDescr, calcPrecision);
-cutTimeVec = [2 7];
-cutVecEllTube = fromMatEllTube.cut(cutTimeVec);
-cutTimePoint = 5;
-cutPointEllTube = fromMatEllTube.cut(cutTimePoint);
+% An example of concatenating ellipsoid tube objects containing random
+% number of ellipsoid tubes (from one to ten tubes).
+%
+nTubes = randi(10,1);
+nPoints = 20;
+type = 1;
+timeBeg1 = 0;
+timeEnd1 = 1;
+firstEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg1,timeEnd1,type,nPoints);
+timeBeg2 = 1;
+timeEnd2 = 2;
+secondEllTubeObj =...
+
gras.ellapx.smartdb.test.examples.getEllTube(nTubes,timeBeg2,timeEnd2,type,nPoints);
+%
+% Concatenating firstEllTube and secondEllTube on [timeBeg1, timeEnd2]
+% vector of time.
+%
+resEllTubeObj = firstEllTubeObj.cat(secondEllTubeObj);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from secondEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',true);
+%
+% Concatenating the same firstEllTube and secondEllTube on
[timeBeg1,timeEnd2]
+% vector of time, but the sTime and values of properties corresponding to
+% sTime are taken from firstEllTube.
+%
+resEllTubeObj =
firstEllTubeObj.cat(secondEllTubeObj,'isReplacedByNew',false);
+%
+% Note that we cannot concatenate ellipsoid tubes with overlapping time
+% limits.
+%
+
+