Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
JPSreport
Manage
Activity
Members
Labels
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
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JuPedSim
JPSreport
Commits
4cee65ef
Verified
Commit
4cee65ef
authored
6 years ago
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
in misplaces return method_I
parent
3f685a30
No related branches found
Branches containing commit
No related tags found
2 merge requests
!15
Resolve "Method D | IndividualFD file use wrong PersID"
,
!14
Resolve "Method I | new measurement method"
Pipeline
#17474
passed
6 years ago
Stage: configure
Stage: compile
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
methods/Method_I.cpp
+1
-31
1 addition, 31 deletions
methods/Method_I.cpp
with
1 addition
and
31 deletions
methods/Method_I.cpp
+
1
−
31
View file @
4cee65ef
...
...
@@ -214,8 +214,8 @@ bool Method_I::Process(const PedData& peddata,const fs::path& scriptsLocation, c
{
fclose
(
_fIndividualFD
);
}
return
return_value
;
}
return
return_value
;
}
bool
Method_I
::
OpenFileMethodI
()
...
...
@@ -522,36 +522,6 @@ bool Method_I::Process(const PedData& peddata,const fs::path& scriptsLocation, c
velo
.
close
();
}
/*std::string polygon_to_string2(const polygon_2d & polygon)
{
string polygon_str = "((";
for(auto point: boost::geometry::exterior_ring(polygon) )
{
double x = boost::geometry::get<0>(point);
double y = boost::geometry::get<1>(point);
polygon_str.append("(");
polygon_str.append(std::to_string(x));
polygon_str.append(", ");
polygon_str.append(std::to_string(y));
polygon_str.append("), ");
}
for(auto ring: boost::geometry::interior_rings(polygon) )
{
for(auto point: ring )
{
double x = boost::geometry::get<0>(point);
double y = boost::geometry::get<1>(point);
polygon_str.append("(");
polygon_str.append(std::to_string(x));
polygon_str.append(", ");
polygon_str.append(std::to_string(y));
polygon_str.append("), ");
}
}
polygon_str.pop_back(); polygon_str.pop_back(); //remove last komma
polygon_str.append("))");
return polygon_str;
}*/
void
Method_I
::
GetIndividualFD
(
const
vector
<
polygon_2d
>&
polygon
,
const
vector
<
double
>&
Velocity
,
const
vector
<
int
>&
Id
,
const
polygon_2d
&
measureArea
,
const
string
&
frid
)
{
...
...
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