Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Frida
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coenen, Joachim
Frida
Commits
4b5b668d
Commit
4b5b668d
authored
16 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
immer noch absurde 270-er non-Kommentare aus dualplot l. 435.
Versuch mit %14.7g
parent
23b618ee
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/curve.cpp
+11
-7
11 additions, 7 deletions
src/curve.cpp
src/dualplot.cpp
+1
-1
1 addition, 1 deletion
src/dualplot.cpp
src/olm.cpp
+10
-0
10 additions, 0 deletions
src/olm.cpp
src/olm.h
+4
-5
4 additions, 5 deletions
src/olm.h
with
26 additions
and
13 deletions
src/curve.cpp
+
11
−
7
View file @
4b5b668d
...
...
@@ -469,8 +469,8 @@ double myeval( double x, void* data )
namespace
NCurveFile
{
void
IntegrateFile
(
const
COlc
*
fin
,
const
int
k
,
const
string
mode
,
const
int
ip
,
const
string
name
);
const
COlc
*
fin
,
const
int
k
,
const
string
&
mode
,
const
int
ip
,
const
string
&
name
,
const
CCoord
&
ico
);
double
NumericIntegral
(
const
COlc
*
fc
,
const
CCurve
*
c
,
const
int
k
,
const
int
j
,
const
double
low
,
const
double
hig
);
...
...
@@ -540,10 +540,12 @@ void NCurveFile::Integrate(void)
CList
parsel
(
mode
,
CLimits
(
0
,
fin
->
nPar
()
-
1
)
);
for
(
uint
iv
=
0
;
iv
<
parsel
.
n
();
++
iv
){
int
ip
=
parsel
.
V
[
iv
];
IntegrateFile
(
fin
,
fiter
.
SelNo
(),
"p"
,
ip
,
"p"
+
strg
(
ip
)
);
IntegrateFile
(
fin
,
fiter
.
SelNo
(),
"p"
,
ip
,
"p"
+
strg
(
ip
),
fin
->
PCo
[
ip
]
);
}
}
else
// other integrals
IntegrateFile
(
fin
,
fiter
.
SelNo
(),
mode
,
-
1
,
mode
);
IntegrateFile
(
fin
,
fiter
.
SelNo
(),
mode
,
-
1
,
mode
,
CCoord
(
"mode"
,
""
)
);
}
}
...
...
@@ -551,8 +553,8 @@ void NCurveFile::Integrate(void)
//! Extract exactly one integral from each curve of fin.
void
NCurveFile
::
IntegrateFile
(
const
COlc
*
fin
,
const
int
k
,
const
string
mode
,
const
int
ip
,
const
string
name
)
const
string
&
mode
,
const
int
ip
,
const
string
&
name
,
const
CCoord
&
ico
)
{
COld
fout
;
CScan
S
;
...
...
@@ -566,7 +568,9 @@ void NCurveFile::IntegrateFile( const COlc *fin, const int k,
fout
.
name
.
replace
(
0
,
4
,
""
);
fout
.
name
.
insert
(
0
,
name
+
"_"
);
fout
.
xco
=
fin
->
ZCo
.
back
();
fout
.
yco
=
fin
->
PCo
[
ip
];
fout
.
yco
=
ico
;
if
(
fout
.
ZCo
.
size
()
<
1
)
throw
string
(
"input has no z coord"
);
fout
.
ZCo
.
pop_back
();
S
.
Clear
();
S
.
z
=
fin
->
VC
[
0
].
z
;
...
...
This diff is collapsed.
Click to expand it.
src/dualplot.cpp
+
1
−
1
View file @
4b5b668d
...
...
@@ -432,7 +432,7 @@ void NPlot::Line(const int lstyle,
ps_accu
.
push_back
(
outlin
);
for
(
uint
i
=
0
;
i
<
np
;
i
++
)
{
snprintf
(
outlin
,
LINSIZ
,
"%7.3f%7.3f%7.3f t%c %% %1
2.6
g wx %1
2.6
g wy
\n
"
,
"%7.3f%7.3f%7.3f t%c %% %1
4.7
g wx %1
4.7
g wy
\n
"
,
X
.
pc
(
xp
[
i
]),
Y
.
pc
(
yp
[
i
]),
0.0
,
i
==
0
?
'i'
:
i
==
np
-
1
?
'f'
:
' '
,
xp
[
i
],
yp
[
i
]);
...
...
This diff is collapsed.
Click to expand it.
src/olm.cpp
+
10
−
0
View file @
4b5b668d
...
...
@@ -85,6 +85,16 @@ void COlo::SaveHeader_a01(FILE *fd)
//***************************************************************************//
COld
::
COld
(
class
COlc
const
*
c
)
{
name
=
c
->
name
;
lDoc
=
c
->
lDoc
;
xco
=
c
->
xco
;
yco
=
c
->
yco
;
ZCo
=
c
->
ZCo
;
RPar
=
c
->
RPar
;
}
//! Save bulk of online file in one of several formats.
void
COld
::
SaveBody
(
FILE
*
fd
,
string
fmt
)
...
...
This diff is collapsed.
Click to expand it.
src/olm.h
+
4
−
5
View file @
4b5b668d
...
...
@@ -18,7 +18,7 @@ class COlo { // on-line object (virtual base class for COld, COlc)
vector
<
CParam
>
RPar
;
bool
as_on_disk
;
virtual
inline
~
COlo
(
void
)
{
};
// magic: makes dynamic_cast possible
virtual
inline
~
COlo
(
void
)
{};
// magic: makes dynamic_cast possible
inline
uint
nZ
(
void
)
const
{
return
ZCo
.
size
();
};
...
...
@@ -30,9 +30,8 @@ class COld : public COlo { // on-line data file
public:
vector
<
CScan
>
VS
;
inline
COld
(
void
)
{
};
COld
(
class
COlc
const
*
c
)
{};
//COld(CCoord CX, CCoord CY, CGrid VX, vector<double> VY);
inline
COld
(
void
)
{};
COld
(
class
COlc
const
*
c
);
inline
uint
nScan
(
void
)
const
{
return
VS
.
size
();
};
uint
nPts
(
uint
j
)
const
;
...
...
@@ -65,7 +64,7 @@ class CEle {
void
*
Ptr
;
public
:
inline
CEle
(
void
)
{
};
inline
CEle
(
void
)
{};
inline
CEle
(
COld
*
pin
)
{
Typ
=
DATA
;
Ptr
=
(
void
*
)
pin
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment