Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed Isomap data model and bugs.

  • Loading branch information...
commit af2aec63635a266d54805f542066fe18850597c7 1 parent cc2cf09
lvdmaaten authored November 02, 2011

Showing 46 changed files with 247 additions and 54 deletions. Show diff stats Hide diff stats

  1. BIN  DerivedData/Divvy/Index/Divvy.hmap
  2. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb
  3. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-shm
  4. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-wal
  5. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-dir
  6. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-file
  7. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-res
  8. BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-sym
  9. BIN  DerivedData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth
  10. 31  ...y/Index/PrecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth.hash-criteria
  11. BIN  DerivedData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth
  12. 28  ...y/Index/PrecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth.hash-criteria
  13. BIN  DerivedData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth
  14. 32  ...y/Index/PrecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth.hash-criteria
  15. BIN  DerivedData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth
  16. 31  ...y/Index/PrecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth.hash-criteria
  17. BIN  DerivedData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth
  18. 28  ...y/Index/PrecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth.hash-criteria
  19. BIN  DerivedData/Divvy/Logs/Debug/148A0636-875F-41FC-B21B-5D7C1A6CBB21.xcactivitylog
  20. BIN  DerivedData/Divvy/Logs/Debug/47000699-11BD-482E-8CEF-7E12FC0C1BE5.xcactivitylog
  21. BIN  DerivedData/Divvy/Logs/Debug/69C402CB-0908-4D61-9CAC-582EBA2E2CD2.xcactivitylog
  22. BIN  DerivedData/Divvy/Logs/Debug/Cache.db
  23. BIN  DerivedData/Divvy/Logs/Debug/E6D309B4-E05C-4A28-B4FB-CD9B218B9CF4.xcactivitylog
  24. BIN  DerivedData/Divvy/Logs/Debug/ECD4CC1F-3C8A-48F8-BA1F-62E699AB973A.xcactivitylog
  25. BIN  DerivedData/Divvy/Logs/Debug/F282827B-51D6-419F-BC31-EA9848624A87.xcactivitylog
  26. BIN  DerivedData/Divvy/Logs/Issues/05D419E2-3E21-4CA2-A62C-08E031E81290.xcactivitylog
  27. BIN  DerivedData/Divvy/Logs/Issues/149B999D-2826-4AD0-AA10-5A8BD3926240.xcactivitylog
  28. BIN  DerivedData/Divvy/Logs/Issues/1FBBE5AB-6CC0-4FC6-8663-C0985ECF3FD7.xcactivitylog
  29. BIN  DerivedData/Divvy/Logs/Issues/2BC3D912-7669-4CEA-8B13-54BDB2917917.xcactivitylog
  30. BIN  DerivedData/Divvy/Logs/Issues/3836382B-7424-4982-98CA-F5EF53F69048.xcactivitylog
  31. BIN  DerivedData/Divvy/Logs/Issues/383856AA-5C78-4D4C-9B97-71F60B126B6D.xcactivitylog
  32. BIN  DerivedData/Divvy/Logs/Issues/477DBB4C-05EC-414C-BD5E-4EA9F2C8D7AA.xcactivitylog
  33. BIN  DerivedData/Divvy/Logs/Issues/A224A09B-85B0-4174-96F5-5281EFA5FE2E.xcactivitylog
  34. BIN  DerivedData/Divvy/Logs/Issues/B401E26D-6052-47BA-A4DE-F172F31ECE7C.xcactivitylog
  35. BIN  DerivedData/Divvy/Logs/Issues/C8EE8BD2-5546-4A54-81C1-D6E97865E124.xcactivitylog
  36. BIN  DerivedData/Divvy/Logs/Issues/Cache.db
  37. BIN  DerivedData/Divvy/Logs/Issues/E9DAB43E-1952-470C-9101-9D514A311E74.xcactivitylog
  38. BIN  DerivedData/Divvy/Logs/Issues/FBEA8094-FFEB-4527-B3BD-56D26752A542.xcactivitylog
  39. 5  Plugins/Reducers/Isomap/DivvyIsomap.xcdatamodel/.xccurrentversion → DerivedData/Divvy/info.plist
  40. 32  Divvy.xcodeproj/project.pbxproj
  41. 8  Plugins/Reducers/Isomap/DivvyIsomap.h
  42. 6  Plugins/Reducers/Isomap/DivvyIsomap.mm
  43. 15  Plugins/Reducers/Isomap/DivvyIsomap.xcdatamodeld/DivvyIsomap.xcdatamodel/contents
  44. 85  Plugins/Reducers/Isomap/DivvyIsomap.xib
  45. BIN  Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/elements
  46. BIN  Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/layout
BIN  DerivedData/Divvy/Index/Divvy.hmap
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-shm
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb-wal
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-dir
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-file
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-res
Binary file not shown
BIN  DerivedData/Divvy/Index/Divvy.xcindex/db.xcindexdb.strings-sym
Binary file not shown
BIN  ...edData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth
Binary file not shown
31  ...ndex/PrecompiledHeaders/Divvy_Prefix-anaslepmqyypkphflzubsreeydwf_ast/Divvy_Prefix.pch.pth.hash-criteria
... ...
@@ -0,0 +1,31 @@
  1
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
  2
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  3
+x86_64-apple-darwin11.2.0
  4
+-x
  5
+objective-c++
  6
+-arch
  7
+x86_64
  8
+-fmessage-length=0
  9
+-fdiagnostics-print-source-range-info
  10
+-fdiagnostics-show-category=id
  11
+-fdiagnostics-parseable-fixits
  12
+-fpascal-strings
  13
+-O0
  14
+-isysroot
  15
+/Developer/SDKs/MacOSX10.7.sdk
  16
+-fasm-blocks
  17
+-mmacosx-version-min=10.6
  18
+-gdwarf-2
  19
+-fvisibility-inlines-hidden
  20
+-DIBOutlet=__attribute__((iboutlet))
  21
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
  22
+-DIBAction=void)__attribute__((ibaction)
  23
+-iquote
  24
+-iquote
  25
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
  26
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
  27
+-ferror-limit=10
  28
+-working-directory=/Users/laurens/divvy
  29
+-Xclang
  30
+-detailed-preprocessing-record
  31
+SDK_PRODUCT_BUILD_VERSION=11C63
BIN  ...edData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth
Binary file not shown
28  ...ndex/PrecompiledHeaders/Divvy_Prefix-eavnzjdcuchwxzfljdggbeowvcvb_ast/Divvy_Prefix.pch.pth.hash-criteria
... ...
@@ -0,0 +1,28 @@
  1
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
  2
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  3
+x86_64-apple-darwin11.2.0
  4
+-x
  5
+c++
  6
+-arch
  7
+x86_64
  8
+-fmessage-length=0
  9
+-fdiagnostics-print-source-range-info
  10
+-fdiagnostics-show-category=id
  11
+-fdiagnostics-parseable-fixits
  12
+-fpascal-strings
  13
+-O0
  14
+-isysroot
  15
+/Developer/SDKs/MacOSX10.7.sdk
  16
+-fasm-blocks
  17
+-mmacosx-version-min=10.6
  18
+-gdwarf-2
  19
+-fvisibility-inlines-hidden
  20
+-iquote
  21
+-iquote
  22
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
  23
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
  24
+-ferror-limit=10
  25
+-working-directory=/Users/laurens/divvy
  26
+-Xclang
  27
+-detailed-preprocessing-record
  28
+SDK_PRODUCT_BUILD_VERSION=11C63
BIN  ...edData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth
Binary file not shown
32  ...ndex/PrecompiledHeaders/Divvy_Prefix-ebbdtrmhldwfjweaxzgwsitrkibz_ast/Divvy_Prefix.pch.pth.hash-criteria
... ...
@@ -0,0 +1,32 @@
  1
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
  2
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  3
+x86_64-apple-darwin11.2.0
  4
+-x
  5
+objective-c
  6
+-arch
  7
+x86_64
  8
+-fmessage-length=0
  9
+-fdiagnostics-print-source-range-info
  10
+-fdiagnostics-show-category=id
  11
+-fdiagnostics-parseable-fixits
  12
+-std=gnu99
  13
+-fpascal-strings
  14
+-O0
  15
+-isysroot
  16
+/Developer/SDKs/MacOSX10.7.sdk
  17
+-fasm-blocks
  18
+-mmacosx-version-min=10.6
  19
+-gdwarf-2
  20
+-fvisibility=hidden
  21
+-DIBOutlet=__attribute__((iboutlet))
  22
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
  23
+-DIBAction=void)__attribute__((ibaction)
  24
+-iquote
  25
+-iquote
  26
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
  27
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
  28
+-ferror-limit=10
  29
+-working-directory=/Users/laurens/divvy
  30
+-Xclang
  31
+-detailed-preprocessing-record
  32
+SDK_PRODUCT_BUILD_VERSION=11C63
BIN  ...edData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth
Binary file not shown
31  ...ndex/PrecompiledHeaders/Divvy_Prefix-fojrdnrezwyrfvawnypjgdajojwj_ast/Divvy_Prefix.pch.pth.hash-criteria
... ...
@@ -0,0 +1,31 @@
  1
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
  2
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  3
+x86_64-apple-darwin11.2.0
  4
+-x
  5
+objective-c
  6
+-arch
  7
+x86_64
  8
+-fmessage-length=0
  9
+-fdiagnostics-print-source-range-info
  10
+-fdiagnostics-show-category=id
  11
+-fdiagnostics-parseable-fixits
  12
+-std=gnu99
  13
+-fpascal-strings
  14
+-O0
  15
+-isysroot
  16
+/Developer/SDKs/MacOSX10.7.sdk
  17
+-fasm-blocks
  18
+-mmacosx-version-min=10.6
  19
+-gdwarf-2
  20
+-DIBOutlet=__attribute__((iboutlet))
  21
+-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))
  22
+-DIBAction=void)__attribute__((ibaction)
  23
+-iquote
  24
+-iquote
  25
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
  26
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
  27
+-ferror-limit=10
  28
+-working-directory=/Users/laurens/divvy
  29
+-Xclang
  30
+-detailed-preprocessing-record
  31
+SDK_PRODUCT_BUILD_VERSION=11C63
BIN  ...edData/Divvy/Index/PrecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth
Binary file not shown
28  ...ndex/PrecompiledHeaders/Divvy_Prefix-gldozzdovqplcodjzwmqncsfrxuw_ast/Divvy_Prefix.pch.pth.hash-criteria
... ...
@@ -0,0 +1,28 @@
  1
+Contents of /Users/laurens/divvy/Core/Divvy_Prefix.pch
  2
+3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  3
+x86_64-apple-darwin11.2.0
  4
+-x
  5
+c
  6
+-arch
  7
+x86_64
  8
+-fmessage-length=0
  9
+-fdiagnostics-print-source-range-info
  10
+-fdiagnostics-show-category=id
  11
+-fdiagnostics-parseable-fixits
  12
+-std=gnu99
  13
+-fpascal-strings
  14
+-O0
  15
+-isysroot
  16
+/Developer/SDKs/MacOSX10.7.sdk
  17
+-fasm-blocks
  18
+-mmacosx-version-min=10.6
  19
+-gdwarf-2
  20
+-iquote
  21
+-iquote
  22
+-I/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug/include
  23
+-F/Users/laurens/divvy/DerivedData/Divvy/Build/Products/Debug
  24
+-ferror-limit=10
  25
+-working-directory=/Users/laurens/divvy
  26
+-Xclang
  27
+-detailed-preprocessing-record
  28
+SDK_PRODUCT_BUILD_VERSION=11C63
BIN  DerivedData/Divvy/Logs/Debug/148A0636-875F-41FC-B21B-5D7C1A6CBB21.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/47000699-11BD-482E-8CEF-7E12FC0C1BE5.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/69C402CB-0908-4D61-9CAC-582EBA2E2CD2.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/Cache.db
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/E6D309B4-E05C-4A28-B4FB-CD9B218B9CF4.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/ECD4CC1F-3C8A-48F8-BA1F-62E699AB973A.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Debug/F282827B-51D6-419F-BC31-EA9848624A87.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/05D419E2-3E21-4CA2-A62C-08E031E81290.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/149B999D-2826-4AD0-AA10-5A8BD3926240.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/1FBBE5AB-6CC0-4FC6-8663-C0985ECF3FD7.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/2BC3D912-7669-4CEA-8B13-54BDB2917917.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/3836382B-7424-4982-98CA-F5EF53F69048.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/383856AA-5C78-4D4C-9B97-71F60B126B6D.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/477DBB4C-05EC-414C-BD5E-4EA9F2C8D7AA.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/A224A09B-85B0-4174-96F5-5281EFA5FE2E.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/B401E26D-6052-47BA-A4DE-F172F31ECE7C.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/C8EE8BD2-5546-4A54-81C1-D6E97865E124.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/Cache.db
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/E9DAB43E-1952-470C-9101-9D514A311E74.xcactivitylog
Binary file not shown
BIN  DerivedData/Divvy/Logs/Issues/FBEA8094-FFEB-4527-B3BD-56D26752A542.xcactivitylog
Binary file not shown
5  .../Isomap/DivvyIsomap.xcdatamodel/.xccurrentversion → DerivedData/Divvy/info.plist
... ...
@@ -1,5 +1,8 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3
 <plist version="1.0">
4  
-<dict/>
  4
+<dict>
  5
+	<key>WorkspacePath</key>
  6
+	<string>/Users/laurens/divvy/Divvy.xcodeproj</string>
  7
+</dict>
5 8
 </plist>
32  Divvy.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
26 26
 		0D86ADEE1428990F00877901 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D77DF783118636A2009C1946 /* Accelerate.framework */; };
27 27
 		0D86ADEF1428990F00877901 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D730D27713B5297E00E01F31 /* Cocoa.framework */; };
28 28
 		0D86AE011428BC5A00877901 /* DivvyIsomap.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0D86AE001428BC5A00877901 /* DivvyIsomap.xib */; };
  29
+		0D8F0C111461ABBD007E3376 /* DivvyIsomap.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */; };
29 30
 		0D9C419E13FD00D700E59675 /* tsne.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C419D13FD00D700E59675 /* tsne.c */; };
30 31
 		0D9C41A113FD00E900E59675 /* DivvyTSNE.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C41A013FD00E900E59675 /* DivvyTSNE.m */; };
31 32
 		0D9C41A413FD00F800E59675 /* DivvyTSNEController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C41A313FD00F800E59675 /* DivvyTSNEController.m */; };
@@ -121,6 +122,13 @@
121 122
 			remoteGlobalIDString = 0D55DC5C13FA9FCA000ADAFB;
122 123
 			remoteInfo = DivvyPCA;
123 124
 		};
  125
+		0DC7D5741461AB52001D57BF /* PBXContainerItemProxy */ = {
  126
+			isa = PBXContainerItemProxy;
  127
+			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
  128
+			proxyType = 1;
  129
+			remoteGlobalIDString = 0D86ADE51428990F00877901;
  130
+			remoteInfo = DivvyIsomap;
  131
+		};
124 132
 		D704B6A913E088B1002692E9 /* PBXContainerItemProxy */ = {
125 133
 			isa = PBXContainerItemProxy;
126 134
 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -227,10 +235,10 @@
227 235
 		0D86ADFA14289A7400877901 /* isomap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomap.h; sourceTree = "<group>"; };
228 236
 		0D86ADFB1428A47C00877901 /* dijkstra.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dijkstra.cpp; sourceTree = "<group>"; };
229 237
 		0D86ADFD1428A4DD00877901 /* fibheap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fibheap.h; sourceTree = "<group>"; };
230  
-		0D86ADFE1428BC1F00877901 /* DivvyIsomap.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = DivvyIsomap.xcdatamodel; sourceTree = "<group>"; };
231 238
 		0D86AE001428BC5A00877901 /* DivvyIsomap.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DivvyIsomap.xib; sourceTree = "<group>"; };
232 239
 		0D86AE021428BEF600877901 /* DivvyIsomapController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DivvyIsomapController.h; sourceTree = "<group>"; };
233 240
 		0D86AE031428BEF600877901 /* DivvyIsomapController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DivvyIsomapController.m; sourceTree = "<group>"; };
  241
+		0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = DivvyIsomap.xcdatamodel; sourceTree = "<group>"; };
234 242
 		0D9C419113FD007100E59675 /* DivvyTSNE.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DivvyTSNE.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
235 243
 		0D9C419213FD007100E59675 /* DivvyTSNE-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "DivvyTSNE-Info.plist"; sourceTree = "<group>"; };
236 244
 		0D9C419C13FD00D700E59675 /* tsne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsne.h; sourceTree = "<group>"; };
@@ -516,11 +524,11 @@
516 524
 				0D86AE021428BEF600877901 /* DivvyIsomapController.h */,
517 525
 				0D86AE031428BEF600877901 /* DivvyIsomapController.m */,
518 526
 				0D86ADF814289A4F00877901 /* isomap.cpp */,
  527
+				0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */,
519 528
 				0D86ADFA14289A7400877901 /* isomap.h */,
520 529
 				D792E57B14292A4F0084626A /* DivvyIsomap.plist */,
521 530
 				0D86ADFB1428A47C00877901 /* dijkstra.cpp */,
522 531
 				0D86ADFD1428A4DD00877901 /* fibheap.h */,
523  
-				0D86ADFE1428BC1F00877901 /* DivvyIsomap.xcdatamodel */,
524 532
 				0D86AE001428BC5A00877901 /* DivvyIsomap.xib */,
525 533
 			);
526 534
 			path = Isomap;
@@ -924,6 +932,7 @@
924 932
 				D7A24DA813F3225C001AD337 /* PBXTargetDependency */,
925 933
 				D7A24DAA13F3225C001AD337 /* PBXTargetDependency */,
926 934
 				0D55DCAD13FAA0D2000ADAFB /* PBXTargetDependency */,
  935
+				0DC7D5751461AB52001D57BF /* PBXTargetDependency */,
927 936
 				D751AC9D13FD7E780089FAAE /* PBXTargetDependency */,
928 937
 				D7A250F81402F7E2001AD337 /* PBXTargetDependency */,
929 938
 				D792E59A14292C1E0084626A /* PBXTargetDependency */,
@@ -1238,6 +1247,7 @@
1238 1247
 				0D2312AB143B5E82009DD6DD /* isomap.h in Sources */,
1239 1248
 				0D2312AD143B5E82009DD6DD /* dijkstra.cpp in Sources */,
1240 1249
 				0D2312AE143B5E82009DD6DD /* fibheap.h in Sources */,
  1250
+				0D8F0C111461ABBD007E3376 /* DivvyIsomap.xcdatamodeld in Sources */,
1241 1251
 			);
1242 1252
 			runOnlyForDeploymentPostprocessing = 0;
1243 1253
 		};
@@ -1362,6 +1372,11 @@
1362 1372
 			target = 0D55DC5C13FA9FCA000ADAFB /* DivvyPCA */;
1363 1373
 			targetProxy = 0D55DCAC13FAA0D2000ADAFB /* PBXContainerItemProxy */;
1364 1374
 		};
  1375
+		0DC7D5751461AB52001D57BF /* PBXTargetDependency */ = {
  1376
+			isa = PBXTargetDependency;
  1377
+			target = 0D86ADE51428990F00877901 /* DivvyIsomap */;
  1378
+			targetProxy = 0DC7D5741461AB52001D57BF /* PBXContainerItemProxy */;
  1379
+		};
1365 1380
 		D704B6AA13E088B1002692E9 /* PBXTargetDependency */ = {
1366 1381
 			isa = PBXTargetDependency;
1367 1382
 			target = D704B6A013E08871002692E9 /* DivvyScatterPlot */;
@@ -2142,6 +2157,19 @@
2142 2157
 			defaultConfigurationName = Release;
2143 2158
 		};
2144 2159
 /* End XCConfigurationList section */
  2160
+
  2161
+/* Begin XCVersionGroup section */
  2162
+		0D8F0C0F1461ABBD007E3376 /* DivvyIsomap.xcdatamodeld */ = {
  2163
+			isa = XCVersionGroup;
  2164
+			children = (
  2165
+				0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */,
  2166
+			);
  2167
+			currentVersion = 0D8F0C101461ABBD007E3376 /* DivvyIsomap.xcdatamodel */;
  2168
+			path = DivvyIsomap.xcdatamodeld;
  2169
+			sourceTree = "<group>";
  2170
+			versionGroupType = wrapper.xcdatamodel;
  2171
+		};
  2172
+/* End XCVersionGroup section */
2145 2173
 	};
2146 2174
 	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
2147 2175
 }
8  Plugins/Reducers/Isomap/DivvyIsomap.h
@@ -6,15 +6,17 @@
6 6
 //  Copyright 2011 Delft University of Technology. All rights reserved.
7 7
 //
8 8
 
9  
-#import <CoreData/CoreData.h>
  9
+#import <Cocoa/Cocoa.h>
10 10
 #import "DivvyReducer.h"
11 11
 
12  
-@interface DivvyIsomap : NSManagedObject
  12
+
  13
+@interface DivvyIsomap : NSManagedObject <DivvyReducer>
13 14
 
14 15
 @property (nonatomic, retain) NSString *reducerID;
15 16
 @property (nonatomic, retain) NSString *name;
16 17
 
17  
-@property (nonatomic, retain) NSNumber *k;
  18
+@property (nonatomic, retain) NSNumber *d;
18 19
 
  20
+@property (nonatomic, retain) NSNumber *k;
19 21
 
20 22
 @end
6  Plugins/Reducers/Isomap/DivvyIsomap.mm
@@ -18,6 +18,8 @@ @implementation DivvyIsomap
18 18
 @dynamic reducerID;
19 19
 @dynamic name;
20 20
 
  21
+@dynamic d;
  22
+
21 23
 @dynamic k;
22 24
 
23 25
 
@@ -28,6 +30,10 @@ - (void) awakeFromInsert {
28 30
 	self.reducerID = [[NSProcessInfo processInfo] globallyUniqueString];
29 31
 }
30 32
 
  33
+- (void) calculateD:(DivvyDataset *)dataset {
  34
+    // Isomap always stays with its default of 2
  35
+}
  36
+
31 37
 - (void) reduceDataset:(DivvyDataset *)dataset
32 38
            reducedData:(NSData *)reducedData {
33 39
 	
15  Plugins/Reducers/Isomap/DivvyIsomap.xcdatamodeld/DivvyIsomap.xcdatamodel/contents
... ...
@@ -1,4 +1,15 @@
1 1
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2  
-<model name="DivvyIsomap" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="872" systemVersion="11C74" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
3  
-    <elements/>
  2
+<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="872" systemVersion="11C74" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
  3
+    <entity name="Isomap" representedClassName="DivvyIsomap" syncable="YES">
  4
+        <attribute name="d" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
  5
+        <attribute name="k" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
  6
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
  7
+        <attribute name="reducerID" optional="YES" attributeType="String" syncable="YES"/>
  8
+    </entity>
  9
+    <configuration name="DivvyIsomap">
  10
+        <memberEntity name="Isomap"/>
  11
+    </configuration>
  12
+    <elements>
  13
+        <element name="Isomap" positionX="160" positionY="192" width="128" height="105"/>
  14
+    </elements>
4 15
 </model>
85  Plugins/Reducers/Isomap/DivvyIsomap.xib
... ...
@@ -1,14 +1,14 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
3 3
 	<data>
4  
-		<int key="IBDocument.SystemTarget">1060</int>
5  
-		<string key="IBDocument.SystemVersion">11B26</string>
6  
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
7  
-		<string key="IBDocument.AppKitVersion">1138</string>
8  
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
  4
+		<int key="IBDocument.SystemTarget">1070</int>
  5
+		<string key="IBDocument.SystemVersion">11C74</string>
  6
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
  7
+		<string key="IBDocument.AppKitVersion">1138.23</string>
  8
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
9 9
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
10 10
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
11  
-			<string key="NS.object.0">1617</string>
  11
+			<string key="NS.object.0">1938</string>
12 12
 		</object>
13 13
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
14 14
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -25,11 +25,8 @@
25 25
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
26 26
 		</object>
27 27
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
28  
-			<bool key="EncodedWithXMLCoder">YES</bool>
29  
-			<object class="NSArray" key="dict.sortedKeys" id="0">
30  
-				<bool key="EncodedWithXMLCoder">YES</bool>
31  
-			</object>
32  
-			<reference key="dict.values" ref="0"/>
  28
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
  29
+			<integer value="1" key="NS.object.0"/>
33 30
 		</object>
34 31
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
35 32
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -52,6 +49,8 @@
52 49
 						<int key="NSvFlags">268</int>
53 50
 						<string key="NSFrame">{{30, 10}, {244, 25}}</string>
54 51
 						<reference key="NSSuperview" ref="1005"/>
  52
+						<reference key="NSWindow"/>
  53
+						<reference key="NSNextKeyView"/>
55 54
 						<bool key="NSEnabled">YES</bool>
56 55
 						<object class="NSSliderCell" key="NSCell" id="472967057">
57 56
 							<int key="NSCellFlags">-2080244224</int>
@@ -73,6 +72,7 @@
73 72
 						<int key="NSvFlags">268</int>
74 73
 						<string key="NSFrame">{{17, 41}, {194, 17}}</string>
75 74
 						<reference key="NSSuperview" ref="1005"/>
  75
+						<reference key="NSWindow"/>
76 76
 						<reference key="NSNextKeyView" ref="168412438"/>
77 77
 						<bool key="NSEnabled">YES</bool>
78 78
 						<object class="NSTextFieldCell" key="NSCell" id="463780674">
@@ -108,6 +108,7 @@
108 108
 				</object>
109 109
 				<string key="NSFrameSize">{299, 67}</string>
110 110
 				<reference key="NSSuperview"/>
  111
+				<reference key="NSWindow"/>
111 112
 				<reference key="NSNextKeyView" ref="58674595"/>
112 113
 				<string key="NSClassName">NSView</string>
113 114
 			</object>
@@ -118,42 +119,15 @@
118 119
 		<object class="IBObjectContainer" key="IBDocument.Objects">
119 120
 			<object class="NSMutableArray" key="connectionRecords">
120 121
 				<bool key="EncodedWithXMLCoder">YES</bool>
121  
-				<object class="IBConnectionRecord">
122  
-					<object class="IBBindingConnection" key="connection">
123  
-						<string key="label">value: self</string>
124  
-						<reference key="source" ref="168412438"/>
125  
-						<reference key="destination" ref="1004"/>
126  
-						<object class="NSNibBindingConnector" key="connector">
127  
-							<reference key="NSSource" ref="168412438"/>
128  
-							<reference key="NSDestination" ref="1004"/>
129  
-							<string key="NSLabel">value: self</string>
130  
-							<string key="NSBinding">value</string>
131  
-							<string key="NSKeyPath">self</string>
132  
-							<object class="NSDictionary" key="NSOptions">
133  
-								<bool key="EncodedWithXMLCoder">YES</bool>
134  
-								<object class="NSArray" key="dict.sortedKeys">
135  
-									<bool key="EncodedWithXMLCoder">YES</bool>
136  
-									<string>NSRaisesForNotApplicableKeys</string>
137  
-									<string>NSValueTransformerName</string>
138  
-								</object>
139  
-								<object class="NSMutableArray" key="dict.values">
140  
-									<bool key="EncodedWithXMLCoder">YES</bool>
141  
-									<boolean value="NO"/>
142  
-									<string>delegate.selectedDatasetView.selectedReducer.k</string>
143  
-								</object>
144  
-							</object>
145  
-							<int key="NSNibBindingConnectorVersion">2</int>
146  
-						</object>
147  
-					</object>
148  
-					<int key="connectionID">45</int>
149  
-				</object>
150 122
 			</object>
151 123
 			<object class="IBMutableOrderedSet" key="objectRecords">
152 124
 				<object class="NSArray" key="orderedObjects">
153 125
 					<bool key="EncodedWithXMLCoder">YES</bool>
154 126
 					<object class="IBObjectRecord">
155 127
 						<int key="objectID">0</int>
156  
-						<reference key="object" ref="0"/>
  128
+						<object class="NSArray" key="object" id="0">
  129
+							<bool key="EncodedWithXMLCoder">YES</bool>
  130
+						</object>
157 131
 						<reference key="children" ref="1000"/>
158 132
 						<nil key="parent"/>
159 133
 					</object>
@@ -261,13 +235,32 @@
261 235
 			<nil key="sourceID"/>
262 236
 			<int key="maxID">45</int>
263 237
 		</object>
264  
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
  238
+		<object class="IBClassDescriber" key="IBDocument.Classes">
  239
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
  240
+				<bool key="EncodedWithXMLCoder">YES</bool>
  241
+				<object class="IBPartialClassDescription">
  242
+					<string key="className">DivvyTSNEController</string>
  243
+					<string key="superclassName">NSViewController</string>
  244
+					<object class="NSMutableDictionary" key="actions">
  245
+						<string key="NS.key.0">changePerplexity:</string>
  246
+						<string key="NS.object.0">id</string>
  247
+					</object>
  248
+					<object class="NSMutableDictionary" key="actionInfosByName">
  249
+						<string key="NS.key.0">changePerplexity:</string>
  250
+						<object class="IBActionInfo" key="NS.object.0">
  251
+							<string key="name">changePerplexity:</string>
  252
+							<string key="candidateClassName">id</string>
  253
+						</object>
  254
+					</object>
  255
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
  256
+						<string key="majorKey">IBProjectSource</string>
  257
+						<string key="minorKey">./Classes/DivvyTSNEController.h</string>
  258
+					</object>
  259
+				</object>
  260
+			</object>
  261
+		</object>
265 262
 		<int key="IBDocument.localizationMode">0</int>
266 263
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
267  
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
268  
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
269  
-			<integer value="1060" key="NS.object.0"/>
270  
-		</object>
271 264
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
272 265
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
273 266
 			<integer value="3000" key="NS.object.0"/>
BIN  Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/elements
Binary file not shown
BIN  Plugins/Reducers/TSNE/DivvyTSNE.xcdatamodel/layout
Binary file not shown

0 notes on commit af2aec6

Please sign in to comment.
Something went wrong with that request. Please try again.