openmx:openmx.git
4 years agoTypo in omxWLSFitFunction.cpp
restabrook [Wed, 19 Jun 2013 19:55:52 +0000 (19:55 +0000)]
Typo in omxWLSFitFunction.cpp

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2584 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agofix typo in mxData print method
mhunter [Wed, 19 Jun 2013 18:00:43 +0000 (18:00 +0000)]
fix typo in mxData print method

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2583 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdded Acov and Thresholds to the print method for mxData.
mhunter [Wed, 19 Jun 2013 17:46:30 +0000 (17:46 +0000)]
Added Acov and Thresholds to the print method for mxData.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2582 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoModified mxSaturatedModel to take either a model or a data set, and added a run=...
mhunter [Wed, 19 Jun 2013 17:26:27 +0000 (17:26 +0000)]
Modified mxSaturatedModel to take either a model or a data set, and added a run= argument with FALSE as the default.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2581 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agomxSaturated model support for ordinal data. Tested against models/passing/JointFIMLT...
mhunter [Wed, 19 Jun 2013 15:26:55 +0000 (15:26 +0000)]
mxSaturated model support for ordinal data.  Tested against models/passing/JointFIMLTest.R and models/nightly/thresholdModel1Factor3Variate.R

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2580 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevise man pages for mxRAMObjective, mxRObjective, and mxExpectationNormal. Add...
sboker [Wed, 19 Jun 2013 13:59:54 +0000 (13:59 +0000)]
Revise man pages for mxRAMObjective, mxRObjective, and mxExpectationNormal.  Add mxExpectationRAM man page.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2579 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoSkip recomputing thresholds when they don't exist
jpritikin [Wed, 19 Jun 2013 13:12:34 +0000 (13:12 +0000)]
Skip recomputing thresholds when they don't exist

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2578 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoName critical section
jpritikin [Wed, 19 Jun 2013 13:12:26 +0000 (13:12 +0000)]
Name critical section

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2577 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDetermine correct # of dir to strip for gcov
jpritikin [Wed, 19 Jun 2013 13:12:19 +0000 (13:12 +0000)]
Determine correct # of dir to strip for gcov

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2576 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoReplace completely broken PBS cpus detection
jpritikin [Wed, 19 Jun 2013 11:06:29 +0000 (11:06 +0000)]
Replace completely broken PBS cpus detection

PBS_NODEFILE would be used to control snowfall style parallelism.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2575 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoMove slow PPML tests to nightly since PPML is not heavily used anyway
jpritikin [Wed, 19 Jun 2013 11:06:21 +0000 (11:06 +0000)]
Move slow PPML tests to nightly since PPML is not heavily used anyway

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2574 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix MultilevelUniRandomSlopeInt regression
jpritikin [Wed, 19 Jun 2013 11:06:02 +0000 (11:06 +0000)]
Fix MultilevelUniRandomSlopeInt regression

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2573 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoImprove log output
jpritikin [Wed, 19 Jun 2013 11:05:52 +0000 (11:05 +0000)]
Improve log output

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2572 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoUpdated omxWLSFitFunction to take new arguments and work as a fit function. Also...
tbrick [Wed, 19 Jun 2013 10:34:43 +0000 (10:34 +0000)]
Updated omxWLSFitFunction to take new arguments and work as a fit function.  Also moved ThresholdColumns structure into Data instead of Expectation, since expectation already relies on access to omxData structures.  Currently causes a segmentation fault in models/passing/jointFactorModelsTest.R.  Sorry.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2571 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoMinor compile fixes
jpritikin [Wed, 19 Jun 2013 06:40:13 +0000 (06:40 +0000)]
Minor compile fixes

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2570 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRemove misplaced coverage option
jpritikin [Wed, 19 Jun 2013 06:32:43 +0000 (06:32 +0000)]
Remove misplaced coverage option

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2569 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdd thread-safe logging functions
jpritikin [Wed, 19 Jun 2013 06:32:33 +0000 (06:32 +0000)]
Add thread-safe logging functions

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2568 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoUpdated wlsPrep2.R
restabrook [Wed, 19 Jun 2013 01:51:14 +0000 (01:51 +0000)]
Updated wlsPrep2.R

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2566 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoEliminated reference to paste0 to keep compatibility with R prior to 2.15.2
mhunter [Tue, 18 Jun 2013 20:11:47 +0000 (20:11 +0000)]
Eliminated reference to paste0 to keep compatibility with R prior to 2.15.2

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2565 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFurther changes to mxData front and back ends.
mhunter [Tue, 18 Jun 2013 20:09:27 +0000 (20:09 +0000)]
Further changes to mxData front and back ends.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2564 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdded new data type='acov' to mxData.
mhunter [Tue, 18 Jun 2013 15:57:08 +0000 (15:57 +0000)]
Added new data type='acov' to mxData.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2563 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoModify documentation for mxData, mxAlgebraObjective, and mxFitFunctionAlgebra
sboker [Tue, 18 Jun 2013 15:42:59 +0000 (15:42 +0000)]
Modify documentation for mxData, mxAlgebraObjective, and mxFitFunctionAlgebra

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2562 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoChanged all objective functions to return NAMED lists of expectation and fitfunction.
mhunter [Tue, 18 Jun 2013 15:30:41 +0000 (15:30 +0000)]
Changed all objective functions to return NAMED lists of expectation and fitfunction.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2561 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoUpdate documentation for mxFIMLObjective, mxAlgebraObjective, mxMLObjective, mxFitFun...
sboker [Tue, 18 Jun 2013 15:30:14 +0000 (15:30 +0000)]
Update documentation for mxFIMLObjective, mxAlgebraObjective, mxMLObjective, mxFitFunctionML, mxFitFunctionAlgebra, and mxExpectationNormal

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2560 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix mxAlgebraObjective to return a NAMED list, instead of an unnamed list. There...
mhunter [Tue, 18 Jun 2013 14:50:49 +0000 (14:50 +0000)]
Fix mxAlgebraObjective to return a NAMED list, instead of an unnamed list.  There are also some incidental changes to type=LISREL.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2559 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoCode test coverage
jpritikin [Tue, 18 Jun 2013 14:15:00 +0000 (14:15 +0000)]
Code test coverage

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2558 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoSwitch over to new structured Compute system
jpritikin [Tue, 18 Jun 2013 09:29:16 +0000 (09:29 +0000)]
Switch over to new structured Compute system

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2554 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRefrain from copying markMatrices to omxState children
jpritikin [Tue, 18 Jun 2013 05:15:11 +0000 (05:15 +0000)]
Refrain from copying markMatrices to omxState children

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2553 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoProvide a backward compatible status
jpritikin [Tue, 18 Jun 2013 05:14:57 +0000 (05:14 +0000)]
Provide a backward compatible status

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2552 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdded manual page for mxFitFunctionML
sboker [Mon, 17 Jun 2013 15:10:59 +0000 (15:10 +0000)]
Added manual page for mxFitFunctionML

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2551 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore expectationList in std::vector
jpritikin [Mon, 17 Jun 2013 07:20:09 +0000 (07:20 +0000)]
Store expectationList in std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2550 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore algebraList in std::vector
jpritikin [Mon, 17 Jun 2013 07:19:59 +0000 (07:19 +0000)]
Store algebraList in std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2549 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoEncapsulate NPSOL into omxComputeGD; rework error status reporting
jpritikin [Sun, 16 Jun 2013 10:59:50 +0000 (10:59 +0000)]
Encapsulate NPSOL into omxComputeGD; rework error status reporting

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2548 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoPrep for omxComputeGradientDescent
jpritikin [Sun, 16 Jun 2013 10:59:11 +0000 (10:59 +0000)]
Prep for omxComputeGradientDescent

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2547 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoConsolidate confidence interval stuff
jpritikin [Sun, 16 Jun 2013 10:58:38 +0000 (10:58 +0000)]
Consolidate confidence interval stuff

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2546 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRename
jpritikin [Sun, 16 Jun 2013 10:58:15 +0000 (10:58 +0000)]
Rename

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2545 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoPass blank gradient and hessian to omxNPSOLConfidenceIntervals
jpritikin [Sun, 16 Jun 2013 10:57:25 +0000 (10:57 +0000)]
Pass blank gradient and hessian to omxNPSOLConfidenceIntervals

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2544 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRemove optimalValues, optimum, and currentInterval from omxState
jpritikin [Sat, 15 Jun 2013 13:08:25 +0000 (13:08 +0000)]
Remove optimalValues, optimum, and currentInterval from omxState

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2543 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRemove fitMatrix from omxState
jpritikin [Sat, 15 Jun 2013 13:08:14 +0000 (13:08 +0000)]
Remove fitMatrix from omxState

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2542 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAvoid possibility of buffer overrun
jpritikin [Sat, 15 Jun 2013 13:08:04 +0000 (13:08 +0000)]
Avoid possibility of buffer overrun

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2541 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 11/11
jpritikin [Fri, 14 Jun 2013 11:53:37 +0000 (11:53 +0000)]
omxComputeEstimateHessian reorg 11/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2540 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 10/11
jpritikin [Fri, 14 Jun 2013 11:53:28 +0000 (11:53 +0000)]
omxComputeEstimateHessian reorg 10/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2539 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 9/11
jpritikin [Fri, 14 Jun 2013 11:53:17 +0000 (11:53 +0000)]
omxComputeEstimateHessian reorg 9/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2538 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 8/11
jpritikin [Fri, 14 Jun 2013 11:53:09 +0000 (11:53 +0000)]
omxComputeEstimateHessian reorg 8/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2537 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 7/11
jpritikin [Fri, 14 Jun 2013 11:53:00 +0000 (11:53 +0000)]
omxComputeEstimateHessian reorg 7/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2536 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 6/11
jpritikin [Fri, 14 Jun 2013 11:52:50 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 6/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2535 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 5/11
jpritikin [Fri, 14 Jun 2013 11:52:40 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 5/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2534 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 4/11
jpritikin [Fri, 14 Jun 2013 11:52:32 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 4/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2533 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 3/11
jpritikin [Fri, 14 Jun 2013 11:52:23 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 3/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2532 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 2/11
jpritikin [Fri, 14 Jun 2013 11:52:12 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 2/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2531 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoomxComputeEstimateHessian reorg 1/11
jpritikin [Fri, 14 Jun 2013 11:52:02 +0000 (11:52 +0000)]
omxComputeEstimateHessian reorg 1/11

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2530 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoEase output data assembly
jpritikin [Thu, 13 Jun 2013 13:17:30 +0000 (13:17 +0000)]
Ease output data assembly

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2529 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoMake fixMatrix usage more explicit in NPSOL
jpritikin [Thu, 13 Jun 2013 13:17:21 +0000 (13:17 +0000)]
Make fixMatrix usage more explicit in NPSOL

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2528 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDeadcode
jpritikin [Thu, 13 Jun 2013 13:17:12 +0000 (13:17 +0000)]
Deadcode

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2527 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoZero mxData location index so set values are easy to see
jpritikin [Thu, 13 Jun 2013 13:17:04 +0000 (13:17 +0000)]
Zero mxData location index so set values are easy to see

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2526 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDump matrices using valid R syntax
jpritikin [Thu, 13 Jun 2013 13:16:56 +0000 (13:16 +0000)]
Dump matrices using valid R syntax

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2525 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoChange fit function init API
jpritikin [Thu, 13 Jun 2013 13:16:49 +0000 (13:16 +0000)]
Change fit function init API

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2524 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoMxFitFunctionMultigroup
jpritikin [Thu, 13 Jun 2013 13:16:37 +0000 (13:16 +0000)]
MxFitFunctionMultigroup

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2523 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix compile error after big revert
jpritikin [Thu, 13 Jun 2013 11:18:56 +0000 (11:18 +0000)]
Fix compile error after big revert

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2522 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Store algebraList in std::vector"
jpritikin [Thu, 13 Jun 2013 11:10:22 +0000 (11:10 +0000)]
Revert "Store algebraList in std::vector"

This reverts commit f99a8edad8f24b5b0bf2fe9b2d9ba00e429af776.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2521 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "MxFitFunctionMultigroup"
jpritikin [Thu, 13 Jun 2013 11:10:11 +0000 (11:10 +0000)]
Revert "MxFitFunctionMultigroup"

This reverts commit a5792f92f128d096f3bd4491d825ebf6e7f1aa1a.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2520 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Split fit function initialization similar to expectations"
jpritikin [Thu, 13 Jun 2013 11:09:55 +0000 (11:09 +0000)]
Revert "Split fit function initialization similar to expectations"

This reverts commit 19da156902497dc0a85b57c9d03a3f6cb4c5d27f.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2519 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Store expectationList in std::vector"
jpritikin [Thu, 13 Jun 2013 11:09:42 +0000 (11:09 +0000)]
Revert "Store expectationList in std::vector"

This reverts commit 7d0e6deae12cf27c78f40f6fab0e39483833141a.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2518 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Leave fitType alone"
jpritikin [Thu, 13 Jun 2013 11:09:29 +0000 (11:09 +0000)]
Revert "Leave fitType alone"

This reverts commit d506f80ec9a084976dfa3d104b02f09ea991c5a3.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2517 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Zero mxData location index so set values are easy to see"
jpritikin [Thu, 13 Jun 2013 11:09:19 +0000 (11:09 +0000)]
Revert "Zero mxData location index so set values are easy to see"

This reverts commit 07348c46f228486908d439be16936bc5aced8894.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2516 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Dump matrices using valid R syntax"
jpritikin [Thu, 13 Jun 2013 11:09:11 +0000 (11:09 +0000)]
Revert "Dump matrices using valid R syntax"

This reverts commit cb97ffc7ca9e9501030c0367a60e9f0817df470c.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2515 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Reorder matrix name processing"
jpritikin [Thu, 13 Jun 2013 11:09:04 +0000 (11:09 +0000)]
Revert "Reorder matrix name processing"

This reverts commit 502339c07b1f22bca331fb0636a8717bcd72f33d.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2514 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Fix inverted matrixNumber in omxMultigroupAdd"
jpritikin [Thu, 13 Jun 2013 11:08:56 +0000 (11:08 +0000)]
Revert "Fix inverted matrixNumber in omxMultigroupAdd"

This reverts commit 54b3bc9ac4439526ce798d4d2b8084a55cefd5f4.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2513 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRevert "Fix recent bugs"
jpritikin [Thu, 13 Jun 2013 11:08:49 +0000 (11:08 +0000)]
Revert "Fix recent bugs"

This reverts commit 082f08d775bbd46049d2f5630865772e67a435f4.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2512 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoOptionally parallelize "make install"
jpritikin [Wed, 12 Jun 2013 12:54:06 +0000 (12:54 +0000)]
Optionally parallelize "make install"

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2511 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDeadcode
jpritikin [Wed, 12 Jun 2013 12:53:59 +0000 (12:53 +0000)]
Deadcode

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2510 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDelete deadcode
jpritikin [Wed, 12 Jun 2013 12:53:52 +0000 (12:53 +0000)]
Delete deadcode

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2509 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoIgnore build products
jpritikin [Wed, 12 Jun 2013 12:53:43 +0000 (12:53 +0000)]
Ignore build products

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2508 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix recent bugs
jpritikin [Tue, 11 Jun 2013 08:04:46 +0000 (08:04 +0000)]
Fix recent bugs

These should have been caught by the buildbot. I guess buildbot
is not using openmp? Anyway, these bugs were introduced after
the initial C++ commit.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2507 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix inverted matrixNumber in omxMultigroupAdd
jpritikin [Mon, 10 Jun 2013 12:05:34 +0000 (12:05 +0000)]
Fix inverted matrixNumber in omxMultigroupAdd

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2506 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoReorder matrix name processing
jpritikin [Mon, 10 Jun 2013 10:45:31 +0000 (10:45 +0000)]
Reorder matrix name processing

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2505 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDump matrices using valid R syntax
jpritikin [Mon, 10 Jun 2013 10:45:23 +0000 (10:45 +0000)]
Dump matrices using valid R syntax

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2504 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoZero mxData location index so set values are easy to see
jpritikin [Mon, 10 Jun 2013 10:45:16 +0000 (10:45 +0000)]
Zero mxData location index so set values are easy to see

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2503 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoLeave fitType alone
jpritikin [Mon, 10 Jun 2013 09:43:58 +0000 (09:43 +0000)]
Leave fitType alone

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2502 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore expectationList in std::vector
jpritikin [Mon, 10 Jun 2013 09:43:48 +0000 (09:43 +0000)]
Store expectationList in std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2501 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoSplit fit function initialization similar to expectations
jpritikin [Mon, 10 Jun 2013 09:43:38 +0000 (09:43 +0000)]
Split fit function initialization similar to expectations

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2500 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoMxFitFunctionMultigroup
jpritikin [Mon, 10 Jun 2013 08:59:13 +0000 (08:59 +0000)]
MxFitFunctionMultigroup

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2499 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore algebraList in std::vector
jpritikin [Mon, 10 Jun 2013 08:58:52 +0000 (08:58 +0000)]
Store algebraList in std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2498 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdd some ignores
jpritikin [Sun, 9 Jun 2013 11:42:44 +0000 (11:42 +0000)]
Add some ignores

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2497 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDocument potential code cleanup plan
jpritikin [Sun, 9 Jun 2013 11:42:37 +0000 (11:42 +0000)]
Document potential code cleanup plan

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2496 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore dataList in std::vector
jpritikin [Sun, 9 Jun 2013 11:42:30 +0000 (11:42 +0000)]
Store dataList in std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2495 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoInitialize fit functions after expectations
jpritikin [Sun, 9 Jun 2013 11:42:18 +0000 (11:42 +0000)]
Initialize fit functions after expectations

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2494 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAll style guides recommend against "using namespace std;" in headers
jpritikin [Sun, 9 Jun 2013 11:42:10 +0000 (11:42 +0000)]
All style guides recommend against "using namespace std;" in headers

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2493 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore matrixList as a std::vector
jpritikin [Sun, 9 Jun 2013 08:21:55 +0000 (08:21 +0000)]
Store matrixList as a std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2492 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoStore freeVar locations in a std::vector
jpritikin [Sun, 9 Jun 2013 08:21:39 +0000 (08:21 +0000)]
Store freeVar locations in a std::vector

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2491 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoProtect R against C++ exceptions
jpritikin [Sat, 8 Jun 2013 11:33:53 +0000 (11:33 +0000)]
Protect R against C++ exceptions

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2490 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoSwitch to C++
jpritikin [Sat, 8 Jun 2013 11:33:36 +0000 (11:33 +0000)]
Switch to C++

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2489 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFix a few minor signedness warnings
jpritikin [Sat, 8 Jun 2013 11:31:57 +0000 (11:31 +0000)]
Fix a few minor signedness warnings

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2488 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoRemove unimplemented OMX_SOCKET_CHECKPOINT
jpritikin [Sat, 8 Jun 2013 11:31:46 +0000 (11:31 +0000)]
Remove unimplemented OMX_SOCKET_CHECKPOINT

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2487 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoAdd CRAN prep script
jpritikin [Fri, 7 Jun 2013 13:25:36 +0000 (13:25 +0000)]
Add CRAN prep script

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2486 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFail better when assigning to model$objective
jpritikin [Fri, 10 May 2013 14:12:47 +0000 (14:12 +0000)]
Fail better when assigning to model$objective

See http://openmx.psyc.virginia.edu/thread/2106

The fix is not specific to this problem and may fix other error cases as
well. The new error output for this case is:

Error: Right-hand side of assignment operator has illegal value
MxExpectationNormal and MxFitFunctionML

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2485 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoFixed data sorting problem in state space models with lots of help from Tim Brick...
mhunter [Mon, 6 May 2013 14:58:28 +0000 (14:58 +0000)]
Fixed data sorting problem in state space models with lots of help from Tim Brick.  Primary change is moving expectationFunctionAddEntities three lines up so that it happens BEFORE convertDatasets in mxRun.R

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2484 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoDocument buildbot configuration
jpritikin [Thu, 2 May 2013 16:05:43 +0000 (16:05 +0000)]
Document buildbot configuration

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2483 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoQuiet annoying PPML warning
jpritikin [Wed, 1 May 2013 21:13:59 +0000 (21:13 +0000)]
Quiet annoying PPML warning

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2482 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1

4 years agoModifications to passing models and PPML to eliminate some but not all warnings.
mhunter [Fri, 26 Apr 2013 04:35:49 +0000 (04:35 +0000)]
Modifications to passing models and PPML to eliminate some but not all warnings.

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2481 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1