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
5ebbd363
Commit
5ebbd363
authored
14 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
//debmsg
parent
b284c537
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pub/src/plot.cpp
+12
-12
12 additions, 12 deletions
pub/src/plot.cpp
pub/test/test-ci
+0
-0
0 additions, 0 deletions
pub/test/test-ci
with
12 additions
and
12 deletions
pub/src/plot.cpp
+
12
−
12
View file @
5ebbd363
...
...
@@ -271,11 +271,11 @@ void NPlot::Plot( class CPlot *plot, bool add )
// refinement loop:
for
(
int
iref
=
0
;
;
++
iref
)
{
cout
<<
"DEB iref="
<<
iref
<<
"
\n
"
;
//
cout << "DEB iref=" << iref << "\n";
// evaluate curve for grid xc:
fc
->
curve_val_vec
(
&
yc
,
xc
,
k
,
j
);
cout
<<
"DEB evaluation -> "
<<
xc
.
size
()
<<
"
\n
"
;
//
cout << "DEB evaluation -> " << xc.size() << "\n";
// merge xc,yc and xn,yn:
if
(
iref
==
0
)
{
...
...
@@ -306,9 +306,9 @@ void NPlot::Plot( class CPlot *plot, bool add )
}
xn
=
xa
;
yn
=
ya
;
}
cout
<<
"DEB merger -> "
<<
xn
.
size
()
<<
"
\n
"
;
for
(
uint
i
=
0
;
i
<
xn
.
size
();
++
i
)
printf
(
"DEB xy %12.6g %12.6g
\n
"
,
xn
[
i
],
yn
[
i
]
);
//
cout << "DEB merger -> " << xn.size() << "\n";
//
for ( uint i=0; i<xn.size(); ++i )
//
printf ("DEB xy %12.6g %12.6g\n", xn[i], yn[i] );
// end of loop
if
(
iref
>=
10
||
xn
.
size
()
>=
plot
->
maxpoints
)
...
...
@@ -338,9 +338,9 @@ void NPlot::Plot( class CPlot *plot, bool add )
xa
.
push_back
(
xn
.
back
()
);
ya
.
push_back
(
yn
.
back
()
);
xn
=
xa
;
yn
=
ya
;
cout
<<
"DEB within frame -> "
<<
xn
.
size
()
<<
"
\n
"
;
for
(
uint
i
=
0
;
i
<
xn
.
size
();
++
i
)
printf
(
"DEB xy %12.6g %12.6g
\n
"
,
xn
[
i
],
yn
[
i
]
);
//
cout << "DEB within frame -> " << xn.size() << "\n";
//
for ( uint i=0; i<xn.size(); ++i )
//
printf ("DEB xy %12.6g %12.6g\n", xn[i], yn[i] );
// set additional base points:
bool
insert_next
=
false
;
...
...
@@ -353,14 +353,14 @@ void NPlot::Plot( class CPlot *plot, bool add )
if
(
fabs
(
yn
[
i
]
-
yi
)
>
0.01
*
(
plot
->
Y
.
sup
-
plot
->
Y
.
inf
)
)
{
xc
.
push_back
(
(
xn
[
i
-
1
]
+
xn
[
i
])
/
2
);
cout
<<
"DEB disc "
<<
xc
.
back
()
<<
"
\n
"
;
//
cout << "DEB disc " << xc.back() << "\n";
insert_next
=
true
;
continue
;
}
}
if
(
insert_next
)
{
xc
.
push_back
(
(
xn
[
i
-
1
]
+
xn
[
i
])
/
2
);
cout
<<
"DEB next "
<<
xc
.
back
()
<<
"
\n
"
;
//
cout << "DEB next " << xc.back() << "\n";
insert_next
=
false
;
continue
;
}
...
...
@@ -368,7 +368,7 @@ void NPlot::Plot( class CPlot *plot, bool add )
!
plot
->
Y
.
contains
(
yc
[
i
-
1
])
)
||
(
!
plot
->
Y
.
contains
(
yc
[
i
])
&&
plot
->
Y
.
contains
(
yc
[
i
-
1
])
)
)
{
cout
<<
"DEB edge "
<<
xc
.
back
()
<<
"
\n
"
;
//
cout << "DEB edge " << xc.back() << "\n";
xc
.
push_back
(
(
xn
[
i
-
1
]
+
xn
[
i
])
/
2
);
continue
;
}
...
...
@@ -392,7 +392,7 @@ void NPlot::Plot( class CPlot *plot, bool add )
}
if
(
!
plot
->
Y
.
contains
(
yn
[
i
])
||
i
==
xn
.
size
()
-
1
)
{
if
(
xa
.
size
()
){
cout
<<
"DEB segment -> "
<<
xa
.
size
()
<<
"
\n
"
;
//
cout << "DEB segment -> " << xa.size() << "\n";
plot
->
addSpec
(
true
,
cstyle
,
xa
,
ya
,
novec
,
f
->
V
[
j
]
->
z
,
f
->
xco
.
str
(),
f
->
yco
.
str
(),
...
...
This diff is collapsed.
Click to expand it.
pub/test/
h
→
pub/test/
test-ci
+
0
−
0
View file @
5ebbd363
File moved
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