編集履歴

質問編集履歴

コードの改善

2020/03/08 22:17

投稿

do_Shiro_to

スコア15

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -126,7 +126,7 @@
 		int mCurrentIndex = 0;
-		Vector<T> *mMyVector = nullptr;
+		Vector<T> *mMyVector = nullptr;
 		friend class Vector<T>;
@@ -144,17 +144,15 @@
 	public:
 		T& GetData()
 		{
-			if (mData[mCurrentIndex] != nullptr)
+			if (mMyVector[mCurrentIndex] != nullptr)
 			{
-				return mData[mCurrentIndex];
+				return mMyVector[mCurrentIndex];
 			}
@@ -166,7 +164,7 @@
 		{
-			mCurrentIndex = mCurrentIndex + 1;
+			mCurrentIndex += 1;
 		}
@@ -178,13 +176,15 @@
 			mCurrentIndex = 0;
+			int tSize = mMyVector->Size();
-			while (Size() != mCurrentIndex-1)
+			while (tSize != mCurrentIndex-1)
 			{
-				if (mData[mCurrentIndex] == rhs.GetData)
+				if (mMyVector[mCurrentIndex] == rhs.GetData)
 				{
@@ -198,9 +198,7 @@
-			if (tCount == Size())
+			if (tCount == tSize)
 			{
@@ -218,13 +216,11 @@
 		}
-		}
 	};
-	Iterator Insert(Iterator tWhere, const T& tWhat) // These two use iterators now
+	Iterator Insert(Iterator tWhere, const T& tWhat)
 	{
@@ -236,6 +232,8 @@
 		int tSize = 0;
+		int tRet = 0;
 		T* tData = new T[mCapacity];
@@ -244,7 +242,7 @@
 		{
-			if(i == tWhere)
+			if(mData[i] == tWhere)
 			{
@@ -252,6 +250,8 @@
 				tSize++;
+				tRet = i + 1;
 			}
 			tData[tSize] = mData[i];
@@ -270,55 +270,311 @@
+		Iterator tAnswer(mData, tRet);
+		return tAnswer;
+	}
+	Iterator Erase(Iterator tWhere)
+	{
+		int tSize = 0;
+		int tRet = 0;
+		T* tData = new T[mCapacity];
+		for (int i = 0; i < mSize; i++)
+		{
+			if (mData[i] == tWhere)
+			{
+				++tSize;
+				tData[i] = mData[tSize];
+				tRet = i+1;
+			}
+			tData[i] = mData[tSize];
+			++tSize;
+		}
+		delete[] mData;
+		mData = tData;
+		mSize = i;
+		Iterator tAnswer(mData, tRet);
+		return tAnswer;
+	}
+	Iterator Begin()
+	{
+		Iterator tAnswer(mData, 0);
+		return tAnswer;
+	}
+	Iterator End()
+	{
+		Iterator tAnswer(mData, mSize);
+		return tAnswer;
+	}
+};
+template<typename T>
+T Vector<T>::sUndefined;
+```
+```C++
+template <typename T>
+class List
+{
+	struct ListNode
+	{
+		ListNode()
+		{
+			mPrev = nullptr;
+			mNext = nullptr;
+		}
+		T mData;
+		ListNode* mPrev;
+		ListNode* mNext;
+	};
+	ListNode* mHead;
+	ListNode* mTail;
+public:
+	List()
+	{
+		//mHead = nullptr;// Technically works, but we gain so much with sentinel nodes
+		//mTail = nullptr;
+		mHead = new ListNode;// You always know there is a node to the left and right
+		mTail = new ListNode;
+		mHead->mNext = mTail;
+		mTail->mPrev = mHead;
+	}
+	List(const List& tOther) : List();
+	List& operator = (const List& tRHS);
+	~List();
+	void PushFront(const T& tWhat);
+	void PopFront();
+	static T sUnspecifiedStaticVar;
+	T& Front();
+	void PushBack(const T& tWhat);
+	void PopBack();
+	T& Back();
+	int Size();
+	void Clear();
+	T& At(int tWhere) const;
+	class Iterator
+	{
+		ListNode* mCurrent;
+		friend class List<T>;
+		Iterator(ListNode* tStart)
+		{
+			mCurrent = tStart;
+		}
+	public:
+		T& GetData()
+		{
+			return mCurrent->mData;
+		}
+		void Next()
+		{
+			mCurrent = mCurrent->mNext;
+		}
+		bool IsEqual(const Iterator& rhs) const
+		{
+			return mCurrent == rhs.mCurrent;
+		}
+	};
+	Iterator Insert(Iterator tWhere, const T& tWhat)
+	{
+		ListNode* tNew = new ListNode;
+		tNew->mData = tWhat;
+		ListNode* tPrev = tWhere;
+		ListNode* tNext = tPrev->mNext;
+		tNext->mPrev = tPrev;
+		tPrev->mNext = tNew;
+		tNew->mPrev = tPrev;
+		tNew->mNext = tNext;
+		tNext->mPrev = tNew;
-		Iterator tAnswer(mMyVector, tWhere);
+		return Iterator(tNew->mNext);
-		return tAnswer;
-	}
+	}
-	Iterator Erase(Iterator tWhere)
+	Iterator Erase(Iterator tWhat)
-	{
+	{
-		int tSize = 0;
+		ListNode* tDead = tWhat;
-		T* tData = new T[mCapacity];
-		for (int i = 0; i < mSize; i++)
-		{
-			if (i == tWhere)
-			{
-				++tSize;
-				tData[i] = mData[tSize];
+		ListNode* tNext = tDead->mNext;
-			}
-			tData[i] = mData[tSize];
+		ListNode* tPrev = tDead->mPrev;
-			++tSize;
+		tPre->mNext = tDead;
-		}
+		tNext->mPrev = tDead;
-		delete[] mData;
+		delete tDead;
-		mData = tData;
-		mSize = i;
-		Iterator tAnswer(mMyVector, tWhere+1);
+		tPrev->mNext = tNext;
+		tNext->mPrev = tPrev;
-		return tAnswer;
+		return Iterator(tNext);
 	}
@@ -326,9 +582,7 @@
 	{
-		Iterator tAnswer(mMyVector, 0);
+		return Iterator(mHead->mNext);
-		return tAnswer;
 	}
@@ -336,256 +590,98 @@
 	{
-		Iterator tAnswer(mMyVector, mSize-1);
-		return tAnswer;
+		return Iterator(mTail);
 	}
 };
-template<typename T>
-T Vector<T>::sUndefined;
 ```
+VectorとListの関数を簡略しているので、このままコンパイルはできません。
+こんな感じのmainで動かせればいいなと思います。
 ```C++
-template <typename T>
+#include <iostream>
+#include "List.h"
+#include "Vector.h"
+using namespace std;
-class List
+int main()
 {
-	struct ListNode
-	{
-		ListNode()
-		{
-			mPrev = nullptr;
-			mNext = nullptr;
-		}
-		T mData;
-		ListNode* mPrev;
-		ListNode* mNext;
-	};
-	ListNode* mHead;
-	ListNode* mTail;
-public:
-	List()
-	{
-		//mHead = nullptr;// Technically works, but we gain so much with sentinel nodes
-		//mTail = nullptr;
-		mHead = new ListNode;// You always know there is a node to the left and right
-		mTail = new ListNode;
-		mHead->mNext = mTail;
-		mTail->mPrev = mHead;
-	}
-	List(const List& tOther) : List();
-	List& operator = (const List& tRHS);
-	~List();
-	void PushFront(const T& tWhat);
-	void PopFront();
-	static T sUnspecifiedStaticVar;
-	T& Front();
-	void PushBack(const T& tWhat);
-	void PopBack();
-	T& Back();
-	int Size();
-	void Clear();
-	T& At(int tWhere) const;
-	class Iterator
-	{
-		ListNode* mCurrent;
-		friend class List<T>;
-		Iterator(ListNode* tStart)
-		{
-			mCurrent = tStart;
-		}
-	public:
-		T& GetData()
-		{
-			return mCurrent->mData;
-		}
-		void Next()
-		{
-			mCurrent = mCurrent->mNext;
-		}
-		bool IsEqual(const Iterator& rhs) const
-		{
-			return mCurrent == rhs.mCurrent;
-		}
-	};
-	Iterator Insert(Iterator tWhere, const T& tWhat)
-	{
-		ListNode* tNew = new ListNode;
-		ListNode* tPrev = tWhere->mPrev;
-		ListNode* tNext = tWhere->mNext;
-		tNew->mData = tWhat;
-		tPrev->mNext = tNew;
-		tNew->mPrev = tPrev;
-		tNew->mNext = tNext;
-		tNext->mPrev = tNew;
-		return Iterator(tNew);
-	}
-	Iterator Erase(Iterator tWhat)
-	{
-		ListNode* tPrev = tWhat->mPrev;
-		ListNode* tNext = tWhat->mNext;
-		delete tWhat;
-		tPrev->mNext = tNext;
-		tNext->mPrev = tPrev;
-		return Iterator(tNext);
-	}
-	Iterator Begin()
-	{
-		return Iterator(mHead->mNext);
-	}
-	Iterator End()
-	{
-		return Iterator(mTail);
-	}
-};
+	Vector<int> tTester;
+	tTester.PushBack(0);
+	tTester.PushBack(1);
+	tTester.PushBack(2);
+	for (Vector<int>::Iterator iter = tTester.Begin(); !iter.IsEqual(tTester.End()); iter.Next())
+	{
+		cout << iter.GetData() << " ";
+	}
+	cout << endl;
+	tTester.Erase(tTester.Begin());
+	for (Vector<int>::Iterator iter = tTester.Begin(); !iter.IsEqual(tTester.End()); iter.Next())
+	{
+		cout << iter.GetData() << " ";
+	}
+	cout << endl;
+	tTester.Insert(tTester.Begin(), 999);
+	tTester.Insert(tTester.Begin(), 888);
+	for (Vector<int>::Iterator iter = tTester.Begin(); !iter.IsEqual(tTester.End()); iter.Next())
+	{
+		cout << iter.GetData() << " ";
+	}
+}
 ```
 ### 補足情報（FW/ツールのバージョンなど）

脱字の修正

2020/03/08 22:17

投稿

do_Shiro_to

スコア15

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -308,6 +308,12 @@
 		}
+		delete[] mData;
+		mData = tData;
+		mSize = i;
 		Iterator tAnswer(mMyVector, tWhere+1);