Merge pull request #24 from sheryjoe/master

sheryjoe · sheryjoe · commit d75762c567e4 · 2015-06-29T16:04:39.000-06:00
Fixed initial relative weighting to reflect weighting the sampling part of the objective function
diff --git a/src/ShapeWorksRun/ShapeWorksRunApp.txx b/src/ShapeWorksRun/ShapeWorksRunApp.txx
@@ -755,7 +755,8 @@ ShapeWorksRunApp<SAMPLERTYPE>::SetUserParameters(const char *fname)
       }
     }
 
-    this->m_initial_relative_weighting = 0.05;
+    //this->m_initial_relative_weighting = 0.05;
+    this->m_initial_relative_weighting = 20; // shireen - sampling is now the weighted part we increase it during init
     elem = docHandle.FirstChild( "initial_relative_weighting" ).Element();
     if (elem) this->m_initial_relative_weighting = atof(elem->GetText());
 

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,8 @@ ShapeWorksRunApp<SAMPLERTYPE>::SetUserParameters(const char *fname)`
`755`	`755`	`}`
`756`	`756`	`}`
`757`	`757`
`758`		`- this->m_initial_relative_weighting = 0.05;`
	`758`	`+ //this->m_initial_relative_weighting = 0.05;`
	`759`	`+ this->m_initial_relative_weighting = 20; // shireen - sampling is now the weighted part we increase it during init`
`759`	`760`	`elem = docHandle.FirstChild( "initial_relative_weighting" ).Element();`
`760`	`761`	`if (elem) this->m_initial_relative_weighting = atof(elem->GetText());`
`761`	`762`