Commit Graph

50 Commits

Author SHA1 Message Date
Georges Dupéron
ea6cd54b3e Attempt to migrate from numpy.numarray 2017-03-28 19:38:00 +02:00
Georges Dupéron
f5c9dde0ac Attempt to fix renaming of LinearAlgebra? 2017-03-28 19:18:15 +02:00
kwikrick
bac3e1e103 bug fix in make_hcs_3d.py 2014-02-09 07:50:44 +00:00
kwikrick
4ca358c1ef moved icpm code (back) to seperate file 2012-11-08 17:22:52 +00:00
kwikrick
d0381e7e9b added test code for incremental cluster pattern matching 2012-11-02 08:59:52 +00:00
kwikrick
fc9f9f350e added 3D lines 2012-10-19 06:11:12 +00:00
kwikrick
eda5689f0a line mapping (work in progress) 2012-10-05 12:07:50 +00:00
kwikrick
193b224850 changed line mapping (incomplete) 2012-10-05 07:31:00 +00:00
kwikrick
b5121c5bd6 lines 2012-09-12 17:44:33 +00:00
kwikrick
1e88c4d65b added mapping for lines 2012-09-12 14:59:35 +00:00
kwikrick
a4bee26e4e graph layout 2012-09-07 06:48:58 +00:00
kwikrick
94d65af760 more layout; now 8 points in ninepoint.gcs instead of 7 2012-09-03 19:55:12 +00:00
kwikrick
c858529ddc graph layout 2012-08-29 15:30:27 +00:00
kwikrick
3cc66a4402 graph layout 2012-08-29 14:23:55 +00:00
kwikrick
75a16ea982 updated licence (copyright dates) 2012-08-28 14:47:46 +00:00
kwikrick
826d05ec66 minor documentation changes 2012-08-28 14:31:30 +00:00
kwikrick
a1d5cc0187 attempt to keep position and orientation of problem with no fixes closest to prototype 2012-08-25 22:29:03 +00:00
kwikrick
53d95d4a34 clsolver now removes point varbles with no dependend clusters 2012-08-24 12:57:26 +00:00
kwikrick
6b26a009f1 made performance test a bit more configurable 2012-08-23 20:15:46 +00:00
kwikrick
6f4ebe93d4 renamed to test_mate.py 2012-08-23 20:02:58 +00:00
kwikrick
dc5b1c708b re-organised test suite 2012-08-23 20:01:49 +00:00
kwikrick
f60475eb3d added Point,Line,Plane,Coincidence classes, towards mapping geometric primitives 2012-08-23 18:53:44 +00:00
kwikrick
27a1d793aa moved set_prototype_selection from solver to problem 2012-08-22 15:15:10 +00:00
kwikrick
22b0d83d36 fixed solution selection bug (introduced in previous commit) 2012-08-21 21:32:36 +00:00
kwikrick
e747c5c348 fixed endless iteration bug due to combination of icremental search, noremove flag and redundant methods 2012-08-21 21:12:29 +00:00
kwikrick
60917c6c1d fixed bug in solve_ada 2012-08-21 19:06:10 +00:00
kwikrick
08ba0f75a5 bugfix in ConnectedTriplets? 2012-08-21 18:43:59 +00:00
kwikrick
2f11d2e388 debug line 2012-08-21 18:10:52 +00:00
kwikrick
b558eeec83 added 2d method DeriveHH2S & MergeSR 2012-08-21 17:32:46 +00:00
kwikrick
9d6002102f matfunc.py - preparing forchange from vector ->matfunc.
intersection.py - added tests (preparing for change vector->matfunc)
clsolver2D.py - added stub for HH2S
2011-08-16 20:32:20 +00:00
kwikrick
69ee114ddc DeriveDAD incremental matcher (wip) 2011-05-26 17:13:03 +00:00
kwikrick
5885229b21 more stuff to do 2011-05-26 14:43:53 +00:00
kwikrick
2f2b6e1d49 work done on 2d solver, added DAD (graph mathing) 2011-05-19 17:07:00 +00:00
kwikrick
b3189bac28 several bug-fixes.
added some assertions to prevent user errors.
test.py: added problematic diamond_3d problem
2011-03-29 21:29:11 +00:00
kwikrick
e758e3c225 fixed invalid syntax (vector.vector[...]) in configuration
fixed bug in Connected(IncrementalSet)
2011-03-29 18:49:27 +00:00
kwikrick
fdf7300eef New 2D solver (clsolver2D.py), far from complete
Lots of changes to make clsolver.py more generic
New incremental 3D methods (clsolver3D.py) but still not complete
New 2D tests
2011-01-29 10:21:01 +00:00
kwikrick
5288253718 Added basis for incremental matching (incremental.py). Currently only used (as a test case) by MergePR.
Re-added decompositionView.py (missing from SWN tree (since revision 8)
2010-07-01 21:09:51 +00:00
kwikrick
2683d68d44 New test for creating and mating blocks 2009-11-21 12:43:54 +00:00
kwikrick
cc4e6f431a geometric.py
FixConstraint now works again in workbench
 GeometricCluster now called GeometricDecomposition
 added MateConstraint

intersections.py:
 fixed degenerate intersections in sss_int and cl_int
 fixed degenerate coordinate systems in make_hcs_3d

matfunc.py: 
 eye now returns a matrix with float values

__init__.py 
  import MateConstraint, LeftHandedConstraint, RightHandedConstraint

configuration.py
  changed how underconstrained situations are is determined

clsolver.py
   add fewer SelectionMethods and PrototypeMethods
   removed methods: rigids(), hedghogs(), balloon(), replaced by clusters()

clsolver3D.py
    added MergeGluable (for solving MateConstraint)

cluster.py
    add Gluable cluster (for solving MateConstraint)

and lots of other small fixes and changes...
2009-11-21 12:42:24 +00:00
kwikrick
673bf117bd Improved some class and function documentation
Cleaned up the code. Moved most code from ClusterSolver3D to ClusterSolver 
Added option to ClusterMethods for hand-coded mathing routines
Added CheckAR Method to fix detection of overconstrained situations
2009-11-18 08:22:33 +00:00
kwikrick
fac2609def Replaced references to depricated Set and ImmutableSet classes with set and frozenset types 2009-11-17 10:27:29 +00:00
kwikrick
74386c1710 Fixed solution-selection and root-transformation bugs. 2009-11-17 09:22:57 +00:00
kwikrick
38c71c882b Simplified output of GeometricSolver.get_cluster.
New decompositionView (replacing compositionView) in workbench
2009-11-16 20:01:47 +00:00
kwikrick
fd0438c86d added LeftHandedConstraint, RightHandedConstraint etc. Small bugfixes. 2009-11-15 12:40:57 +00:00
kwikrick
99b304c882 added support for SelectionConstraint 2009-11-15 12:05:44 +00:00
kwikrick
22e159a5ad Changes to GeometricSolver:
- Added RigidConstraint.
- Depricated some methods (get_result, get_constrainedness) and 
added some new methods (get_solution, get_cluster, get_status).

Removed old SelectionConstraint and renamed FunctionConstraint to SelectionConstraint

Depricated ClusterSolver2D
Small bugfixes in cluster ClusterSolver3D

Renamed solvergui directory to workbench

Renamed solvertest directory to test
2009-10-09 12:23:02 +00:00
kwikrick
fe8d04497f Corrected FixConstraint bug: now just one or two fixed points
will also translate and/or rotatate the solution.
2009-10-06 16:33:16 +00:00
kwikrick
e361ef14d0 Bug Fix: Workbench added point-variables with Vec class for coordinates (from matfunc.py) instead of vector class (from vector.py).
Added a conversion to vector in GeometricProblem.add_paint & .set_point
2009-10-06 15:45:09 +00:00
kwikrick
4fe301a5e6 Bugfix: Fix-constraint now works.
Implemented a mechanism for setting the root cluster so that cluster-merging
takes place in the correct order. For each cluster, a root variable is 
created, which is used in cluster-merging methods to choose which 
cluster to transform, and which too keep fixed. The root-variable 
of the output cluster is related to root-variables of the input
clusters by adding a logical OR method (OrMethod) to the 
method graph.

Rick
2009-10-06 15:26:25 +00:00
kwikrick
9fd7fdb797 moved everything to trunk and deleted geomsolver.html 2009-09-04 15:42:14 +00:00